From b9dab562c055b1561d831690632bb13c873386df Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 1 Feb 2020 19:53:42 +0100
Subject: [PATCH 01/48] Refs #10013 First implementation of CodeMirror.

---
 extension/Classes/Core/AbstractBuildForm.php | 89 ++++++++++++++++++--
 extension/Classes/Core/Constants.php         |  5 +-
 2 files changed, 88 insertions(+), 6 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index e9ffea52..0cd9c199 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -3173,6 +3173,37 @@ abstract class AbstractBuildForm {
         return $element . HelperFormElement::getHelpBlock();
     }
 
+    /**
+     * @param array $formElement
+     * @param $htmlFormElementName
+     * @param $value
+     * @param array $json
+     * @param string $mode
+     * @return string
+     * @throws \CodeException
+     * @throws \UserFormException
+     * @throws \UserReportException
+     */
+    public function buildEditor(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) {
+
+        if (empty($formElement[FE_EDITOR_TYPE])) {
+            $formElement[FE_EDITOR_TYPE] = FE_EDITOR_TYPE_TINYMCE;
+        }
+
+        switch ($formElement[FE_EDITOR_TYPE]) {
+            case FE_EDITOR_TYPE_TINYMCE:
+                $html = $this->buildEditorTinyMCE($formElement, $htmlFormElementName, $value, $json, $mode);
+                break;
+            case FE_EDITOR_TYPE_CODEMIRROR:
+                $html = $this->buildEditorCodeMirror($formElement, $htmlFormElementName, $value, $json, $mode);
+                break;
+            default:
+                throw new \UserFormException("Unexpected editor type: '" . $formElement[FE_EDITOR_TYPE] . "'", ERROR_FORMELEMENT_EDITOR_TYPE);
+        }
+
+        return $html;
+    }
+
     /**
      * Build a HTML 'textarea' element which becomes a TinyMCE Editor.
      * List of possible plugins: https://www.tinymce.com/docs/plugins/
@@ -3188,11 +3219,9 @@ abstract class AbstractBuildForm {
      * @throws \UserFormException
      * @throws \UserReportException
      */
-    public function buildEditor(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) {
+    public function buildEditorTinyMCE(array $formElement, $htmlFormElementName, $value, array &$json, $mode = FORM_LOAD) {
         $attribute = '';
 
-        //TODO plugin autoresize nutzen um Editorgroesse anzugeben
-
         $attribute .= Support::doAttribute('id', $formElement[FE_HTML_ID]);
         $attribute .= Support::doAttribute('name', $htmlFormElementName);
 //        $attribute .= Support::doAttribute('id', $htmlFormElementName);
@@ -3205,7 +3234,7 @@ abstract class AbstractBuildForm {
         $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
         $attribute .= Support::doAttribute('data-title', $formElement[FE_TOOLTIP]);
 
-        $formElement = $this->setEditorConfig($formElement, $htmlFormElementName);
+        $formElement = $this->setEditorTinyMCEConfig($formElement, $htmlFormElementName);
         // $formElement['editor-plugins']='autoresize code'
         // $formElement['editor-contextmenu']='link image | cell row column'
         $json = $this->getPrefixedElementsAsJSON(FE_EDITOR_PREFIX, $formElement);
@@ -3223,6 +3252,55 @@ abstract class AbstractBuildForm {
         return $html . HelperFormElement::getHelpBlock() . $formElement[FE_TMP_EXTRA_BUTTON_HTML] . $formElement[FE_INPUT_EXTRA_BUTTON_INFO];
     }
 
+    /**
+     * @param array $formElement
+     * @param $htmlFormElementName
+     * @param $value
+     * @param array $json
+     * @param $mode
+     * @return string
+     * @throws \CodeException
+     * @throws \UserFormException
+     * @throws \UserReportException
+     */
+    public function buildEditorCodeMirror(array $formElement, $htmlFormElementName, $value, array &$json, $mode) {
+        $attribute = '';
+
+        $attribute .= Support::doAttribute('id', $formElement[FE_HTML_ID]);
+        $attribute .= Support::doAttribute('name', $htmlFormElementName);
+//        $attribute .= Support::doAttribute('id', $htmlFormElementName);
+        $attribute .= Support::doAttribute(ATTRIBUTE_DATA_REFERENCE, $formElement[FE_DATA_REFERENCE]);
+
+        $attribute .= Support::doAttribute('class', 'qfq-codemirror');
+//        $attribute .= Support::doAttribute('data-control-name', "$htmlFormElementName");
+//        $attribute .= Support::doAttribute('data-placeholder', $formElement[FE_PLACEHOLDER]);
+//        $attribute .= Support::doAttribute('data-autofocus', $formElement[FE_AUTOFOCUS]);
+//        $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
+//        $attribute .= Support::doAttribute('data-title', $formElement[FE_TOOLTIP]);
+
+//        $formElement = $this->setEditorTinyMCEConfig($formElement, $htmlFormElementName);
+        // $formElement['editor-plugins']='autoresize code'
+        // $formElement['editor-contextmenu']='link image | cell row column'
+
+        $formElement[FE_EDITOR_PREFIX . 'mode'] = $formElement[FE_EDITOR_PREFIX . 'mode'] ?? "text/x-sql";
+        $formElement[FE_EDITOR_PREFIX . 'lineNumbers'] = $formElement[FE_EDITOR_PREFIX . 'lineNumbers'] ?? true;
+
+        $json = $this->getPrefixedElementsAsJSON(FE_EDITOR_PREFIX, $formElement);
+
+        $attribute .= Support::doAttribute('data-config', $json, true);
+
+        $attribute .= HelperFormElement::getAttributeFeMode($formElement[FE_MODE]);
+        $attribute .= HelperFormElement::getAttributeList($formElement, [F_FE_DATA_PATTERN_ERROR, F_FE_DATA_REQUIRED_ERROR, F_FE_DATA_MATCH_ERROR, F_FE_DATA_ERROR]);
+
+        $json = $this->getFormElementForJson($htmlFormElementName, $value, $formElement);
+
+        $html = Support::wrapTag("<textarea $attribute>", htmlentities($value), false);
+        $formElement = HelperFormElement::prepareExtraButton($formElement, false);
+
+        return $html . HelperFormElement::getHelpBlock() . $formElement[FE_TMP_EXTRA_BUTTON_HTML] . $formElement[FE_INPUT_EXTRA_BUTTON_INFO];
+    }
+
+
     /**
      * Parse $formElement[FE_EDITOR_*] settings and build editor settings.
      *
@@ -3231,7 +3309,7 @@ abstract class AbstractBuildForm {
      *
      * @return array
      */
-    private function setEditorConfig(array $formElement, $htmlFormElementName) {
+    private function setEditorTinyMCEConfig(array $formElement, $htmlFormElementName) {
         $flagMaxHeight = false;
 
         // plugins
@@ -3274,6 +3352,7 @@ abstract class AbstractBuildForm {
         return $formElement;
     }
 
+
     /**
      * Searches for '$prefix*' elements in $formElement. Collect all found elements, strip $prefix (=$keyName) and
      *   returns keys/values JSON encoded.
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index ce13fabd..24fdbb47 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -165,7 +165,7 @@ const ERROR_USER_NOT_LOGGED_IN = 1017;
 const ERROR_USER_LOGGED_IN = 1018;
 const ERROR_FORM_FORBIDDEN = 1019;
 const ERROR_FORM_UNKNOWN_PERMISSION_MODE = 1020;
-
+const ERROR_FORMELEMENT_EDITOR_TYPE = 1021;
 const ERROR_TOKEN_MISSING = 1022;
 const ERROR_RECURSION_TOO_DEEP = 1023;
 const ERROR_CHECKBOXMODE_UNKNOWN = 1024;
@@ -1185,6 +1185,9 @@ const FE_SQL_INSERT = 'sqlInsert'; // Action: Insert Statement to create slave r
 const FE_SQL_DELETE = 'sqlDelete'; // Action: Delete Statement to delete unused slave record.
 const FE_SQL_HONOR_FORM_ELEMENTS = 'sqlHonorFormElements'; // Action: Honor given list of FormElements for sqlInsert|Update|Delete
 const FE_EDITOR_PREFIX = 'editor-'; // TinyMCE configuration settings.
+const FE_EDITOR_TYPE = 'editorType'; // tinymce | codemirror
+const FE_EDITOR_TYPE_TINYMCE = 'tinymce';
+const FE_EDITOR_TYPE_CODEMIRROR = 'codemirror';
 const FE_SENDMAIL_TO = 'sendMailTo'; // Receiver email adresses. Separate multiple by comma.
 const FE_SENDMAIL_CC = 'sendMailCc'; // CC Receiver email adresses. Separate multiple by comma.
 const FE_SENDMAIL_BCC = 'sendMailBcc'; // BCC Receiver email adresses. Separate multiple by comma.
-- 
GitLab


From 598447827506aeb7156a918a848090b104fb51e7 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 1 Feb 2020 21:51:02 +0100
Subject: [PATCH 02/48] Refs #10013 Add phpDoc. Set CM defaults.

---
 extension/Classes/Core/AbstractBuildForm.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 0cd9c199..7a03ba62 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -3174,6 +3174,8 @@ abstract class AbstractBuildForm {
     }
 
     /**
+     * Build an Editor input element: TinyMCE / CodeMirror
+     *
      * @param array $formElement
      * @param $htmlFormElementName
      * @param $value
@@ -3253,6 +3255,9 @@ abstract class AbstractBuildForm {
     }
 
     /**
+     * Build a HTML 'textarea' element which becomes a CodeMirror Editor.
+     * https://codemirror.net/doc/manual.html#overview
+     *
      * @param array $formElement
      * @param $htmlFormElementName
      * @param $value
@@ -3268,7 +3273,6 @@ abstract class AbstractBuildForm {
 
         $attribute .= Support::doAttribute('id', $formElement[FE_HTML_ID]);
         $attribute .= Support::doAttribute('name', $htmlFormElementName);
-//        $attribute .= Support::doAttribute('id', $htmlFormElementName);
         $attribute .= Support::doAttribute(ATTRIBUTE_DATA_REFERENCE, $formElement[FE_DATA_REFERENCE]);
 
         $attribute .= Support::doAttribute('class', 'qfq-codemirror');
@@ -3279,11 +3283,17 @@ abstract class AbstractBuildForm {
 //        $attribute .= Support::doAttribute('data-title', $formElement[FE_TOOLTIP]);
 
 //        $formElement = $this->setEditorTinyMCEConfig($formElement, $htmlFormElementName);
-        // $formElement['editor-plugins']='autoresize code'
-        // $formElement['editor-contextmenu']='link image | cell row column'
+//        $formElement['editor-plugins']='autoresize code'
+//        $formElement['editor-contextmenu']='link image | cell row column'
 
+        // Defaults: fits good to QFQ style programming
         $formElement[FE_EDITOR_PREFIX . 'mode'] = $formElement[FE_EDITOR_PREFIX . 'mode'] ?? "text/x-sql";
         $formElement[FE_EDITOR_PREFIX . 'lineNumbers'] = $formElement[FE_EDITOR_PREFIX . 'lineNumbers'] ?? true;
+        $formElement[FE_EDITOR_PREFIX . 'lineWrapping'] = $formElement[FE_EDITOR_PREFIX . 'lineNumbers'] ?? true;
+
+        if ($formElement[FE_MODE] == FE_MODE_READONLY) {
+            $formElement[FE_EDITOR_PREFIX . 'readOnly'] = true;
+        }
 
         $json = $this->getPrefixedElementsAsJSON(FE_EDITOR_PREFIX, $formElement);
 
-- 
GitLab


From f83446934cadb1e91a3692ce35fd31cdf33a9c3f Mon Sep 17 00:00:00 2001
From: bbaer <bbaer@math.uzh.ch>
Date: Mon, 3 Feb 2020 08:51:39 +0100
Subject: [PATCH 03/48] monospace font added

---
 less/qfq-bs.css.less | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index f8b6dd48..e4afadf3 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -360,6 +360,9 @@ i.@{spinner_class} {
   background-color: #eee;
 }
 
+.mono-space {
+  font-family: "Roboto Mono", "Menlo", "Segoe UI", monospace;
+}
 
 /* inline elements in horizontal mode are too much left */
 .form-horizontal {
-- 
GitLab


From 48cbba86bf8aa803460fe629548b28ed12333c70 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Mon, 3 Feb 2020 13:18:23 +0100
Subject: [PATCH 04/48] NewVersion.md: add git merge hints, renumber

---
 Documentation-develop/NewVersion.md | 30 ++++++++++++++---------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/Documentation-develop/NewVersion.md b/Documentation-develop/NewVersion.md
index 8f095b17..d05436fb 100644
--- a/Documentation-develop/NewVersion.md
+++ b/Documentation-develop/NewVersion.md
@@ -9,15 +9,13 @@ Neuer Build
 Neue Versionsnummer
 ===================
 
-0) Fuer jede neue Version ein Ticket erstellen. Template: #6994
+1) Fuer jede neue Version ein Ticket erstellen. Template: #6994
 
-1) Alle offenen Branches auf **Develop** mergen.
+2) * Merge 'open Branches' to **Develop**.
+   * Merge 'Develop'  to **Master**.
+   * Checkout **Master**.
 
-1a) Develop  auf **Master mergen**.
-
-1b) Wechseln auf **Master**.
-
-2) Die aktuellen Commits anschauen und wichtige Topics uebernehmen (git log > ~/qfq.log, alles bis zum letzten TAG anschauen):
+3) Die aktuellen Commits anschauen und wichtige Topics uebernehmen (git log > ~/qfq.log, alles bis zum letzten TAG anschauen):
 
 
    * **All commits since last tag**:   
@@ -43,7 +41,7 @@ Neue Versionsnummer
      * Alle offenen Tickets im aktuellen Milestones verschieben auf den naechsten Milestone.
      * Abgeschlossene Tickets schliessen. 
 
-3) In folgenden Files anpassen:
+4) In folgenden Files anpassen:
 
    **Achtung**: die Release Minor darf KEINE fuehrenden Nullen enthalten!!! Ansonsten funktioniert die Verteilung vie TER nicht.
 
@@ -54,36 +52,36 @@ Neue Versionsnummer
      * Documentation/Settings.cfg: version
      * extension/ext_emconf.php: version
 
-4) **Documentation**
+5) **Documentation**
 
    make doc-local   (dadurch fallen Fehler in der RESTdoc Syntax auf)
 
-5) **Update Version & Commit**
+6) **Update Version & Commit**
 
    * Update the version number in this document (topic 6)
    * Commit & Push new version changes to master branch: 
    
       New version 20.2.0
 
-6) **New Tag**: 
+7) **New Tag**: 
 
    git tag v20.2.0
    git push -u origin v20.2.0
 
-7) Tickets: 
+8) **Merge 'master' into 'develop'**
+
+9) Tickets: 
    * Schliessen und der QFQ Version zuweisen.
    * Aktuellen Milestone schliessen      
 
-8) T3 Doc aktualisieren
+10) T3 Doc aktualisieren
 
    Sollte durch den git.math.uzh.ch WebHook passieren.
 
-9) Extension hochladen
+11) Extension hochladen
 
    TER: https://extensions.typo3.org/ > Log in > My Extensions.
 
-10) PhpStorm: **Sync** all files to VM qfq.
-
 
 
 
-- 
GitLab


From af965fd145eece8816fe8531596a603de741c5ff Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 4 Feb 2020 17:11:56 +0100
Subject: [PATCH 05/48] Rename config.qfq.example.php config-example.qfq.php

---
 Documentation/Manual.rst                                     | 2 +-
 extension/{config.qfq.example.php => config-example.qfq.php} | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename extension/{config.qfq.example.php => config-example.qfq.php} (100%)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index a9efddab..1bf35043 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -199,7 +199,7 @@ Setup
 
   * If the Extension Manager stops after importing: check your memory limit in php.ini.
 
-* Copy/rename the file *<site path>/typo3conf/ext/qfq/config.example.qfq.php* to *<site path>/typo3conf/config.qfq.php*.
+* Copy/rename the file *<site path>/typo3conf/ext/qfq/config-example.qfq.php* to *<site path>/typo3conf/config.qfq.php*.
   Configure the necessary settings `configuration`_
   The configuration file is outside of the extension directory, to not loose it during de-install and install again.
 * When the QFQ Extension is called the first time on the Typo3 frontend, the file *<ext_dir>/Classes/Sql/formEditor.sql* will
diff --git a/extension/config.qfq.example.php b/extension/config-example.qfq.php
similarity index 100%
rename from extension/config.qfq.example.php
rename to extension/config-example.qfq.php
-- 
GitLab


From ff67ef3de85ae06ce5ff967fe62cae6467fa6998 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 5 Feb 2020 16:59:10 +0100
Subject: [PATCH 06/48] Add error if primary table is missing.

---
 extension/Classes/Core/Database/Database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/Classes/Core/Database/Database.php b/extension/Classes/Core/Database/Database.php
index 2390d08b..12e3ff72 100644
--- a/extension/Classes/Core/Database/Database.php
+++ b/extension/Classes/Core/Database/Database.php
@@ -782,7 +782,7 @@ class Database {
      * @throws \UserFormException
      */
     public function getTableDefinition($table) {
-        return $this->sql("SHOW FIELDS FROM `$table`");
+        return $this->sql("SHOW FIELDS FROM `$table`", ROW_EXPECT_GE_1, array(), "No columns found for table '$table'");
     }
 
     /**
-- 
GitLab


From 608f7e868b724644554f66977acdacbaa69553c2 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 5 Feb 2020 17:22:17 +0100
Subject: [PATCH 07/48] Fix problem in Makefile with renamed
 config-example.qfq.php

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index eb5e9001..89d85cbb 100644
--- a/Makefile
+++ b/Makefile
@@ -8,7 +8,7 @@ RELEASE_DATE = $(shell date '+%Y%m%d%H%M')
 GIT_REVISION_SHORT = $(shell git rev-parse --short HEAD || true)
 GIT_REVISION_LONG = $(shell git rev-parse HEAD || true)
 
-EXTENSION_CONTENT = Classes Configuration Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt config.qfq.example.php RELEASE.txt vendor
+EXTENSION_CONTENT = Classes Configuration Resources ext_emconf.php ext_localconf.php ext_tables.php ext_icon.png ext_conf_template.txt config-example.qfq.php RELEASE.txt vendor
 
 DISTDIR=dist
 
-- 
GitLab


From d07614c10910d966cf57cd204260305d1c333599 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 5 Feb 2020 17:32:18 +0100
Subject: [PATCH 08/48] Fix problem with reporting broken TG-FormElements

---
 extension/Classes/Core/AbstractBuildForm.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index f4e2b207..8a444b17 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -3769,8 +3769,13 @@ EOT;
 
         // Fire 'value' statement
         $tgMax = 0;
-        foreach ($this->feSpecNative as $key => $arr) {
-            $this->feSpecNative[$key][FE_VALUE] = $this->evaluate->parse($arr[FE_VALUE]);
+        foreach ($this->feSpecNative as $key => $fe) {
+
+            // Preparation for Log, Debug
+            $this->store->setVar(SYSTEM_FORM_ELEMENT, Logger::formatFormElementName($fe), STORE_SYSTEM);
+            $this->store->setVar(SYSTEM_FORM_ELEMENT_ID, $fe[FE_ID], STORE_SYSTEM);
+
+            $this->feSpecNative[$key][FE_VALUE] = $this->evaluate->parse($fe[FE_VALUE]);
 
             if (is_array($this->feSpecNative[$key][FE_VALUE])) {
                 $cnt = count($this->feSpecNative[$key][FE_VALUE]);
-- 
GitLab


From 069e329662c6a89db0e07e2b797b87c08681748f Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Thu, 6 Feb 2020 21:03:53 +0100
Subject: [PATCH 09/48] Fix double table id

---
 Documentation/Manual.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 1bf35043..53ecce4b 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -5751,7 +5751,7 @@ and then displays the files in a nice table with links to the files. ::
       10.10.sql = SELECT id, path_scan FROM FileTracker
       WHERE assigned_to = '{{user:R}}'
       10.10.twig = <h2>{{ store.record.user }}</h2>
-      <table id="file-list" class="table table-hover tablesorter" id="{{pageAlias:T}}-twig">
+      <table class="table table-hover tablesorter" id="{{pageAlias:T}}-twig">
         <thead><tr><th>ID</th><th>File</th></tr></thead>
         <tbody>
         {% for row in result %}
-- 
GitLab


From a995301622d6b0777547c09582570ac6b880145f Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@math.uzh.ch>
Date: Fri, 7 Feb 2020 15:07:51 +0100
Subject: [PATCH 10/48] Marc tags typeahead

---
 javascript/src/Helper/tagManager.js      | 551 +++++++++++++++++++++++
 javascript/src/TypeAhead.js              | 279 +++++++++---
 less/qfq-bs.css.less                     |   5 +
 mockup/{typeahead.html => typeahead.php} |  50 ++
 4 files changed, 810 insertions(+), 75 deletions(-)
 create mode 100644 javascript/src/Helper/tagManager.js
 rename mockup/{typeahead.html => typeahead.php} (79%)

diff --git a/javascript/src/Helper/tagManager.js b/javascript/src/Helper/tagManager.js
new file mode 100644
index 00000000..11df1404
--- /dev/null
+++ b/javascript/src/Helper/tagManager.js
@@ -0,0 +1,551 @@
+/* ===================================================
+ * tagmanager.js v3.0.2
+ * http://welldonethings.com/tags/manager
+ * ===================================================
+ * Copyright 2012 Max Favilli
+ *
+ * Licensed under the Mozilla Public License, Version 2.0 You may not use this work except in compliance with the License.
+ *
+ * http://www.mozilla.org/MPL/2.0/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================== */
+(function ($) {
+
+    "use strict";
+
+    var defaults = {
+            prefilled: null,
+            CapitalizeFirstLetter: false,
+            preventSubmitOnEnter: true,     // deprecated
+            isClearInputOnEsc: true,        // deprecated
+            externalTagId: false,
+            prefillIdFieldName: 'Id',
+            prefillValueFieldName: 'Value',
+            AjaxPush: null,
+            AjaxPushAllTags: null,
+            AjaxPushParameters: null,
+            delimiters: [9, 13, 44],        // tab, enter, comma
+            backspace: [8],
+            maxTags: 0,
+            hiddenTagListName: null,        // deprecated
+            hiddenTagListId: null,          // deprecated
+            replace: true,
+            output: null,
+            deleteTagsOnBackspace: true,    // deprecated
+            tagsContainer: null,
+            tagCloseIcon: 'x',
+            tagClass: '',
+            validator: null,
+            onlyTagList: false,
+            tagList: null,
+            fillInputOnTagRemove: false,
+            AjaxPushDataType: 'json' //allow plugin to send data using different encodings (xml, json, script, text, html)
+        },
+
+        publicMethods = {
+            pushTag: function (tag, ignoreEvents, externalTagId, ignoreValidator) {
+                var $self = $(this), opts = $self.data('opts'), alreadyInList, tlisLowerCase, max, tagId,
+                    tlis = $self.data("tlis"), tlid = $self.data("tlid"), idx, newTagId, newTagRemoveId, escaped,
+                    html, $el, lastTagId, lastTagObj;
+
+                tag = privateMethods.trimTag(tag, opts.delimiterChars);
+
+                if (!tag || tag.length <= 0) {
+                    return;
+                }
+
+                // check if restricted only to the tagList suggestions
+                if (opts.onlyTagList && undefined !== opts.tagList) {
+
+                    //if the list has been updated by look pushed tag in the tagList. if not found return
+                    if (opts.tagList) {
+                        var $tagList = opts.tagList;
+
+                        // change each array item to lower case
+                        $.each($tagList, function (index, item) {
+                            $tagList[index] = item.toLowerCase();
+                        });
+                        var suggestion = $.inArray(tag.toLowerCase(), $tagList);
+
+                        if (-1 === suggestion) {
+                            //console.log("tag:" + tag + " not in tagList, not adding it");
+                            return;
+                        }
+                    }
+
+                }
+
+                if (opts.CapitalizeFirstLetter && tag.length > 1) {
+                    tag = tag.charAt(0).toUpperCase() + tag.slice(1).toLowerCase();
+                }
+
+                // call the validator (if any) and do not let the tag pass if invalid
+                if (!ignoreValidator && opts.validator && !opts.validator(tag)) {
+                    $self.trigger('tm:invalid', tag);
+                    return;
+                }
+
+                // dont accept new tags beyond the defined maximum
+                if (opts.maxTags > 0 && tlis.length >= opts.maxTags) {
+                    return;
+                }
+
+                alreadyInList = false;
+                //use jQuery.map to make this work in IE8 (pure JS map is JS 1.6 but IE8 only supports JS 1.5)
+                tlisLowerCase = jQuery.map(tlis, function (elem) {
+                    return elem.toLowerCase();
+                });
+
+                idx = $.inArray(tag.toLowerCase(), tlisLowerCase);
+
+                if (-1 !== idx) {
+                    // console.log("tag:" + tag + " !!already in list!!");
+                    alreadyInList = true;
+                }
+
+                if (alreadyInList) {
+                    $self.trigger('tm:duplicated', tag);
+                    if (opts.blinkClass) {
+                        for (var i = 0; i < 6; ++i) {
+                            $("#" + $self.data("tm_rndid") + "_" + tlid[idx]).queue((function (_$, loc_opts, next) {
+                                _$(this).toggleClass(loc_opts.blinkClass);
+                                next();
+                            }).bind(this, $, opts)).delay(100);
+                        }
+                    } else {
+                        $("#" + $self.data("tm_rndid") + "_" + tlid[idx]).stop()
+                            .animate({backgroundColor: opts.blinkBGColor_1}, 100)
+                            .animate({backgroundColor: opts.blinkBGColor_2}, 100)
+                            .animate({backgroundColor: opts.blinkBGColor_1}, 100)
+                            .animate({backgroundColor: opts.blinkBGColor_2}, 100)
+                            .animate({backgroundColor: opts.blinkBGColor_1}, 100)
+                            .animate({backgroundColor: opts.blinkBGColor_2}, 100);
+                    }
+                } else {
+                    if (opts.externalTagId === true) {
+                        if (externalTagId === undefined) {
+                            $.error('externalTagId is not passed for tag -' + tag);
+                        }
+                        tagId = externalTagId;
+                    } else {
+                        max = Math.max.apply(null, tlid);
+                        max = max === -Infinity ? 0 : max;
+
+                        tagId = ++max;
+                    }
+                    if (!ignoreEvents) {
+                        $self.trigger('tm:pushing', [tag, tagId]);
+                    }
+                    tlis.push(tag);
+                    tlid.push(tagId);
+
+                    if (!ignoreEvents)
+                        if (opts.AjaxPush !== null && opts.AjaxPushAllTags == null) {
+                            if ($.inArray(tag, opts.prefilled) === -1) {
+                                $.post(opts.AjaxPush, $.extend({tag: tag}, opts.AjaxPushParameters), null, opts.AjaxPushDataType);
+                            }
+                        }
+
+                    // console.log("tagList: " + tlis);
+
+                    newTagId = $self.data("tm_rndid") + '_' + tagId;
+                    newTagRemoveId = $self.data("tm_rndid") + '_Remover_' + tagId;
+                    escaped = $("<span/>").text(tag).html();
+
+                    html = '<span class="' + privateMethods.tagClasses.call($self) + '" id="' + newTagId + '">';
+                    html += '<span>' + escaped + '</span>';
+                    html += '<a href="#" class="tm-tag-remove" id="' + newTagRemoveId + '" TagIdToRemove="' + tagId + '">';
+                    html += opts.tagCloseIcon + '</a></span> ';
+                    $el = $(html);
+
+
+                    var typeAheadMess = $self.parents('.twitter-typeahead')[0] !== undefined;
+                    if (opts.tagsContainer !== null) {
+                        $(opts.tagsContainer).append($el);
+                    } else {
+                        if (tlid.length > 1) {
+                            if (typeAheadMess) {
+                                lastTagId = $self.data("tm_rndid") + '_' + --tagId;
+                                jQuery('#' + lastTagId).after($el);
+                            } else {
+                                lastTagObj = $self.siblings("#" + $self.data("tm_rndid") + "_" + tlid[tlid.length - 2]);
+                                lastTagObj.after($el);
+                            }
+                        } else {
+                            if (typeAheadMess) {
+                                $self.parents('.twitter-typeahead').before($el);
+                            } else {
+                                $self.before($el);
+                            }
+                        }
+                    }
+
+                    $el.find("#" + newTagRemoveId).on("click", $self, function (e) {
+                        e.preventDefault();
+                        var TagIdToRemove = parseInt($(this).attr("TagIdToRemove"));
+                        privateMethods.spliceTag.call($self, TagIdToRemove, e.data);
+                    });
+
+                    if (!ignoreEvents) {
+                        $self.trigger('tm:pushed', [tag, tagId]);
+                    }
+
+                    privateMethods.refreshHiddenTagList.call($self);
+
+                    privateMethods.showOrHide.call($self);
+                    //if (tagManagerOptions.maxTags > 0 && tlis.length >= tagManagerOptions.maxTags) {
+                    //  obj.hide();
+                    //}
+                }
+                $self.val("");
+
+                // empty field
+                (this).typeahead('val', '');
+            },
+
+            popTag: function () {
+                var $self = $(this), tagId, tagBeingRemoved,
+                    tlis = $self.data("tlis"),
+                    tlid = $self.data("tlid");
+
+                if (tlid.length > 0) {
+                    tagId = tlid.pop();
+
+                    tagBeingRemoved = tlis[tlis.length - 1];
+                    $self.trigger('tm:popping', [tagBeingRemoved, tagId]);
+                    tlis.pop();
+
+                    // console.log("TagIdToRemove: " + tagId);
+                    $("#" + $self.data("tm_rndid") + "_" + tagId).remove();
+                    privateMethods.refreshHiddenTagList.call($self);
+                    $self.trigger('tm:popped', [tagBeingRemoved, tagId]);
+
+                    privateMethods.showOrHide.call($self);
+                    // console.log(tlis);
+                }
+            },
+
+            empty: function () {
+                var $self = $(this), tlis = $self.data("tlis"), tlid = $self.data("tlid"), tagId;
+
+                while (tlid.length > 0) {
+                    tagId = tlid.pop();
+                    tlis.pop();
+                    // console.log("TagIdToRemove: " + tagId);
+                    $("#" + $self.data("tm_rndid") + "_" + tagId).remove();
+                    privateMethods.refreshHiddenTagList.call($self);
+                    // console.log(tlis);
+                }
+                $self.trigger('tm:emptied', null);
+
+                privateMethods.showOrHide.call($self);
+                //if (tagManagerOptions.maxTags > 0 && tlis.length < tagManagerOptions.maxTags) {
+                //  obj.show();
+                //}
+            },
+
+            tags: function () {
+                var $self = this, tlis = $self.data("tlis");
+                return tlis;
+            }
+        },
+
+        privateMethods = {
+            showOrHide: function () {
+                var $self = this, opts = $self.data('opts'), tlis = $self.data("tlis");
+
+                if (opts.maxTags > 0 && tlis.length < opts.maxTags) {
+                    $self.show();
+                    $self.trigger('tm:show');
+                }
+
+                if (opts.maxTags > 0 && tlis.length >= opts.maxTags) {
+                    $self.hide();
+                    $self.trigger('tm:hide');
+                }
+            },
+
+            tagClasses: function () {
+                var $self = $(this), opts = $self.data('opts'), tagBaseClass = opts.tagBaseClass,
+                    inputBaseClass = opts.inputBaseClass, cl;
+                // 1) default class (tm-tag)
+                cl = tagBaseClass;
+                // 2) interpolate from input class: tm-input-xxx --> tm-tag-xxx
+                if ($self.attr('class')) {
+                    $.each($self.attr('class').split(' '), function (index, value) {
+                        if (value.indexOf(inputBaseClass + '-') !== -1) {
+                            cl += ' ' + tagBaseClass + value.substring(inputBaseClass.length);
+                        }
+                    });
+                }
+                // 3) tags from tagClass option
+                cl += (opts.tagClass ? ' ' + opts.tagClass : '');
+                return cl;
+            },
+
+            trimTag: function (tag, delimiterChars) {
+                var i;
+                tag = $.trim(tag);
+                // truncate at the first delimiter char
+                i = 0;
+                for (i; i < tag.length; i++) {
+                    if ($.inArray(tag.charCodeAt(i), delimiterChars) !== -1) {
+                        break;
+                    }
+                }
+                return tag.substring(0, i);
+            },
+
+            refreshHiddenTagList: function () {
+                var $self = $(this), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList");
+
+                if (lhiddenTagList) {
+                    $(lhiddenTagList).val(tlis.join($self.data('opts').baseDelimiter)).change();
+                    $self.trigger('tm:hiddenUpdate', [tlis, $(lhiddenTagList)]);
+                }
+
+                $self.trigger('tm:refresh', tlis.join($self.data('opts').baseDelimiter));
+            },
+
+            killEvent: function (e) {
+                e.cancelBubble = true;
+                e.returnValue = false;
+                e.stopPropagation();
+                e.preventDefault();
+            },
+
+            keyInArray: function (e, ary) {
+                return $.inArray(e.which, ary) !== -1;
+            },
+
+            applyDelimiter: function (e) {
+                var $self = $(this);
+                publicMethods.pushTag.call($self, $(this).val());
+                e.preventDefault();
+            },
+
+            prefill: function (pta) {
+                var $self = $(this);
+                var opts = $self.data('opts');
+                $.each(pta, function (key, val) {
+                    if (opts.externalTagId === true) {
+                        publicMethods.pushTag.call($self, val[opts.prefillValueFieldName], true, val[opts.prefillIdFieldName], true);
+                    } else {
+                        publicMethods.pushTag.call($self, val, true, false, true);
+                    }
+                });
+            },
+
+            pushAllTags: function (e, tag) {
+                var $self = $(this), opts = $self.data('opts'), tlis = $self.data("tlis");
+                if (opts.AjaxPushAllTags) {
+                    if (e.type !== 'tm:pushed' || $.inArray(tag, opts.prefilled) === -1) {
+                        $.post(opts.AjaxPush, $.extend({tags: tlis.join(opts.baseDelimiter)}, opts.AjaxPushParameters));
+                    }
+                }
+            },
+
+            spliceTag: function (tagId) {
+                var $self = this, tlis = $self.data("tlis"), tlid = $self.data("tlid"), idx = $.inArray(tagId, tlid),
+                    tagBeingRemoved;
+
+                // console.log("TagIdToRemove: " + tagId);
+                // console.log("position: " + idx);
+
+                if (-1 !== idx) {
+                    tagBeingRemoved = tlis[idx];
+                    $self.trigger('tm:splicing', [tagBeingRemoved, tagId]);
+                    $("#" + $self.data("tm_rndid") + "_" + tagId).remove();
+                    tlis.splice(idx, 1);
+                    tlid.splice(idx, 1);
+                    privateMethods.refreshHiddenTagList.call($self);
+                    $self.trigger('tm:spliced', [tagBeingRemoved, tagId]);
+                    // console.log(tlis);
+                }
+
+                privateMethods.showOrHide.call($self);
+                //if (tagManagerOptions.maxTags > 0 && tlis.length < tagManagerOptions.maxTags) {
+                //  obj.show();
+                //}
+            },
+
+            init: function (options) {
+                var opts = $.extend({}, defaults, options), delimiters, keyNums;
+
+                opts.hiddenTagListName = (opts.hiddenTagListName === null) ? 'hidden-' + this.attr('name') : opts.hiddenTagListName;
+
+                delimiters = opts.delimeters || opts.delimiters; // 'delimeter' is deprecated
+                keyNums = [9, 13, 17, 18, 19, 37, 38, 39, 40]; // delimiter values to be handled as key codes
+                opts.delimiterChars = [];
+                opts.delimiterKeys = [];
+
+                $.each(delimiters, function (i, v) {
+                    if ($.inArray(v, keyNums) !== -1) {
+                        opts.delimiterKeys.push(v);
+                    } else {
+                        opts.delimiterChars.push(v);
+                    }
+                });
+
+                opts.baseDelimiter = String.fromCharCode(opts.delimiterChars[0] || 44);
+                opts.tagBaseClass = 'tm-tag';
+                opts.inputBaseClass = 'tm-input';
+
+                if (!$.isFunction(opts.validator)) {
+                    opts.validator = null;
+                }
+
+                this.each(function () {
+                    var $self = $(this), hiddenObj = '', rndid = '',
+                        albet = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
+
+                    // prevent double-initialization of TagManager
+                    if ($self.data('tagManager')) {
+                        return false;
+                    }
+                    $self.data('tagManager', true);
+
+                    for (var i = 0; i < 5; i++) {
+                        rndid += albet.charAt(Math.floor(Math.random() * albet.length));
+                    }
+
+                    $self.data("tm_rndid", rndid);
+
+                    // store instance-specific data in the DOM object
+                    $self.data('opts', opts)
+                        .data('tlis', []) //list of string tags
+                        .data('tlid', []); //list of ID of the string tags
+
+                    if (opts.output === null) {
+                        hiddenObj = $('<input/>', {
+                            type: 'hidden',
+                            name: opts.hiddenTagListName
+                        });
+                        $self.after(hiddenObj);
+                        $self.data("lhiddenTagList", hiddenObj);
+                    } else {
+                        $self.data("lhiddenTagList", $(opts.output));
+                    }
+
+                    if (opts.AjaxPushAllTags) {
+                        $self.on('tm:spliced', privateMethods.pushAllTags);
+                        $self.on('tm:popped', privateMethods.pushAllTags);
+                        $self.on('tm:pushed', privateMethods.pushAllTags);
+                    }
+
+                    // hide popovers on focus and keypress events
+                    $self.on('focus keypress', function (e) {
+                        if ($(this).popover) {
+                            $(this).popover('hide');
+                        }
+                    });
+
+                    // handle ESC (keyup used for browser compatibility)
+                    if (opts.isClearInputOnEsc) {
+                        $self.on('keyup', function (e) {
+                            if (e.which === 27) {
+                                // console.log('esc detected');
+                                $(this).val('');
+                                privateMethods.killEvent(e);
+                            }
+                        });
+                    }
+
+                    $self.on('keypress', function (e) {
+                        // push ASCII-based delimiters
+                        if (privateMethods.keyInArray(e, opts.delimiterChars)) {
+                            privateMethods.applyDelimiter.call($self, e);
+                        }
+                    });
+
+                    $self.on('keydown', function (e) {
+                        // disable ENTER
+                        if (e.which === 13) {
+                            if (opts.preventSubmitOnEnter) {
+                                privateMethods.killEvent(e);
+                            }
+                        }
+
+                        // push key-based delimiters (includes <enter> by default)
+                        if (privateMethods.keyInArray(e, opts.delimiterKeys)) {
+                            privateMethods.applyDelimiter.call($self, e);
+                        }
+                    });
+
+                    // BACKSPACE (keydown used for browser compatibility)
+                    if (opts.deleteTagsOnBackspace) {
+                        $self.on('keydown', function (e) {
+                            if (privateMethods.keyInArray(e, opts.backspace)) {
+                                // console.log("backspace detected");
+                                if ($(this).val().length <= 0) {
+                                    publicMethods.popTag.call($self);
+                                    privateMethods.killEvent(e);
+                                }
+                            }
+                        });
+                    }
+
+                    // on tag pop fill back the tag's content to the input field
+                    if (opts.fillInputOnTagRemove) {
+                        $self.on('tm:popped', function (e, tag) {
+                            $(this).val(tag);
+                        });
+                    }
+
+                    $self.change(function (e) {
+                        if (!/webkit/.test(navigator.userAgent.toLowerCase())) {
+                            $self.focus();
+                        } // why?
+
+                        /* unimplemented mode to push tag on blur
+                         else if (tagManagerOptions.pushTagOnBlur) {
+                         console.log('change: pushTagOnBlur ' + tag);
+                         pushTag($(this).val());
+                         } */
+                        privateMethods.killEvent(e);
+                    });
+
+                    if (opts.prefilled !== null) {
+                        if (typeof (opts.prefilled) === "object") {
+                            privateMethods.prefill.call($self, opts.prefilled);
+                        } else if (typeof (opts.prefilled) === "string") {
+                            privateMethods.prefill.call($self, opts.prefilled.split(opts.baseDelimiter));
+                        } else if (typeof (opts.prefilled) === "function") {
+                            privateMethods.prefill.call($self, opts.prefilled());
+                        }
+                    } else if (opts.output !== null) {
+                        if ($(opts.output) && $(opts.output).val()) {
+                            var existing_tags = $(opts.output);
+                        }
+                        privateMethods.prefill.call($self, $(opts.output).val().split(opts.baseDelimiter));
+                    }
+
+                });
+
+                return this;
+            }
+        };
+
+    $.fn.tagsManager = function (method) {
+        var $self = $(this);
+
+        if (!(0 in this)) {
+            return this;
+        }
+
+        if (publicMethods[method]) {
+            return publicMethods[method].apply($self, Array.prototype.slice.call(arguments, 1));
+        } else if (typeof method === 'object' || !method) {
+            return privateMethods.init.apply(this, arguments);
+        } else {
+            $.error('Method ' + method + ' does not exist.');
+            return false;
+        }
+    };
+
+}(jQuery));
\ No newline at end of file
diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index 0a6e12b5..c510eea2 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -25,9 +25,11 @@ var QfqNS = QfqNS || {};
     n.TypeAhead.install = function (typeahead_endpoint) {
 
         $('.qfq-typeahead').each(function () {
-            var $shadowElement, bloodhoundConfiguration;
+            var bloodhoundConfiguration;
 
             var $element = $(this);
+
+            // bloodhound is used to get the remote data (suggestions)
             bloodhoundConfiguration = {
                 // We need to be notified on success, so we need a promise
                 initialize: false,
@@ -41,94 +43,221 @@ var QfqNS = QfqNS || {};
                     wildcard: '%QUERY'
                 }
             };
-            if ($element.val() !== '') {
-                // We prefetch the value provided
-                bloodhoundConfiguration.prefetch = {};
-                bloodhoundConfiguration.prefetch.url = n.TypeAhead.makePrefetchUrl(typeahead_endpoint, $element.val(), $element);
-                // Disable cache, we expect only a few entries. Caching gives sometimes strange behavior.
-                bloodhoundConfiguration.prefetch.cache = false;
+
+            // initialize typeahead (either with or without tags)
+            if ($element.data('typeahead-tags')) {
+                n.TypeAhead.installWithTags($element, bloodhoundConfiguration);
+            } else {
+                n.TypeAhead.installWithoutTags(typeahead_endpoint, $element, bloodhoundConfiguration);
             }
 
-            $shadowElement = n.TypeAhead.makeShadowElement($element);
 
-            var suggestions = new Bloodhound(bloodhoundConfiguration);
-            var promise = suggestions.initialize();
-            promise.done((function ($element, suggestions) {
-                return function () {
-                    n.TypeAhead.fillTypeAheadFromShadowElement($element, suggestions);
-                };
-            })($element, suggestions));
+        });
+
+    };
 
+    n.TypeAhead.installWithTags = function ($element, bloodhoundConfiguration) {
 
-            $element.typeahead({
-                    hint: n.TypeAhead.getHint($element),
-                    highlight: n.TypeAhead.getHighlight($element),
-                    minLength: n.TypeAhead.getMinLength($element)
-                },
-                {
-                    display: 'value',
-                    source: suggestions,
-                    limit: n.TypeAhead.getLimit($element),
-                    templates: {
-                        suggestion: function (obj) {
-                            return "<div>" + n.TypeAhead.htmlEncode(obj.value) + "</div>";
-                        },
-                        // No message if field is not set to pedantic.
-                        notFound: (function ($_) {
-                            return function (obj) {
-                                if (!!$_.data('typeahead-pedantic'))
-                                    return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
-                            };
-                        })($element)
-                    }
-                });
+        // initialize bloodhound (typeahead suggestion engine)
+        var suggestions = new Bloodhound(bloodhoundConfiguration);
+        suggestions.initialize();
 
+        // prevent form submit when enter key is pressed
+        $element.off('keyup');
+        $element.on('keypress keyup', function (e) {
+            var code = e.keyCode || e.which;
+            if (code === 13) {
+                e.preventDefault();
+                return false;
+            }
+        });
 
-            $element.bind('typeahead:select typeahead:autocomplete', function (event, suggestion) {
-                var $shadowElement = n.TypeAhead.getShadowElement($(event.delegateTarget));
-                $shadowElement.val(suggestion.key);
-            });
+        // list to keep tracks of existing tags and those added during the current session
+        // expected JSON format: [{value: "Alaska", key: "AK"}, {value: "Alabama", key: "AL"}]
+        var existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
 
-            if (!!$element.data('typeahead-pedantic')) {
-                $element.bind('typeahead:change', n.TypeAhead.makePedanticHandler(suggestions));
-                $element.on('keydown', (function (suggestions) {
-                    return function (event) {
-                        if (event.which === 13) {
-                            n.TypeAhead.makePedanticHandler(suggestions)(event);
-                        }
-                    };
-                })(suggestions));
-                // The pedantic handler will test if the shadow element has a value set (the KEY). If not, the
-                // typeahead element is cleared. Thus we have to guarantee that no value exists in the shadow
-                // element the instant the user starts typing since we don't know the outcome of the search.
-                //
-                // If we don't clear the shadow element the instant the user starts typing, and simply let the
-                // `typeahead:select` or `typeahead:autocomplete` handler set the selected value, the
-                // user might do following steps and end up in an inconsistent state:
-                //
-                //  1. Use typeahead to select/autocomplete a suggestion
-                //  2. delete the suggestion
-                //  3. enter a random string
-                //  4. submit form
-                //
-                // This would leave a stale value in the shadow element (from step 1.), and the pedantic handler
-                // would not clear the typeahead element, giving the impression the value in the typeahead element will be submitted.
-                $element.on('input', (function ($shadowElement) {
-                    return function () {
-                        $shadowElement.val('');
-                    };
-                })($shadowElement));
+        // list of current typeahead suggestions
+        var typeaheadList = existingTags.slice();
+
+        // get list of possible keys a user can press to push a tag (list of keycodes)
+        var delimiters = $element.data('typeahead-tag-delimiters');
+        delimiters = delimiters !== undefined ? delimiters : [9, 13, 44];
+
+        // validator function for pedantic mode
+        var pedanticValidator = function (tag) {
+            // check if tag is in typeahead suggestions
+            var tagLookup = typeaheadList.filter(function (t) {return t.value.toLowerCase() === tag.toLowerCase();})[0];
+            return tagLookup !== undefined;
+        };
+
+        // initialize tagsManager
+        var tagApi = $element.tagsManager({
+            deleteTagsOnBackspace: false,
+            hiddenTagListName: $element.attr('name'),
+            tagClass: 'qfq-typeahead-tag',
+            delimiters: delimiters,
+            validator: !!$element.data('typeahead-pedantic') ? pedanticValidator : null,
+        });
+
+        // when tag is pushed, look up key and add it to existingTags
+        tagApi.bind('tm:pushed', function (e, tag) {
+            var tagLookup = typeaheadList.filter(function (t) {return t.value.toLowerCase() === tag.toLowerCase();})[0];
+            if (undefined === tagLookup) {
+                existingTags.push({key: 0, value: tag});
             } else {
-                $element.bind('typeahead:change', function (event, suggestion) {
-                    var $shadowElement = n.TypeAhead.getShadowElement($(event.delegateTarget));
-                    // If none pendatic, suggestion key might not exist, so use suggestion instead.
-                    $shadowElement.val(suggestion.key || suggestion);
-                });
+                existingTags.push({key: tagLookup.key, value: tagLookup.value});
+            }
+        });
+
+        // when the hidden input field changes, overwrite value with tag object list
+        tagApi.bind('tm:hiddenUpdate', function (e, tags, hiddenInput) {
+            var tagObjects = $.map(tags, function (t) {
+                return existingTags.filter(function (tt) {return tt.value === t;})[0];
+            });
+            hiddenInput.val(JSON.stringify(tagObjects));
+        });
+        $element.removeAttr('name');
+
+        // add existing tags
+        $.each(existingTags, function (i, tag) {
+            tagApi.tagsManager('pushTag', tag.value);
+        });
+
+        // add typahead
+        $element.typeahead({
+                // options
+                hint: n.TypeAhead.getHint($element),
+                highlight: n.TypeAhead.getHighlight($element),
+                minLength: n.TypeAhead.getMinLength($element)
+            }, {
+                display: 'value',
+                source: suggestions,
+                limit: n.TypeAhead.getLimit($element),
+                templates: {
+                    suggestion: function (obj) {
+                        return "<div>" + n.TypeAhead.htmlEncode(obj.value) + "</div>";
+                    },
+                    // No message if field is not set to pedantic.
+                    notFound: (function ($_) {
+                        return function (obj) {
+                            if (!!$_.data('typeahead-pedantic'))
+                                return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
+                        };
+                    })($element)
             }
         });
 
+        // directly add tag when clicked on in typahead menu
+        $element.bind('typeahead:selected', function (event, sugg) {
+            tagApi.tagsManager("pushTag", sugg.value);
+        });
+
+        // update typahead list when typahead changes
+        $element.bind('typeahead:render', function (event, sugg) {
+            typeaheadList.length = 0;
+            typeaheadList.push.apply(typeaheadList, sugg);
+        });
     };
 
+    n.TypeAhead.installWithoutTags = function (typeahead_endpoint, $element, bloodhoundConfiguration) {
+        var $shadowElement;
+
+        // Prefetch the value that is already in the field
+        if ($element.val() !== '') {
+            bloodhoundConfiguration.prefetch = {};
+            bloodhoundConfiguration.prefetch.url = n.TypeAhead.makePrefetchUrl(typeahead_endpoint, $element.val(), $element);
+            // Disable cache, we expect only a few entries. Caching gives sometimes strange behavior.
+            bloodhoundConfiguration.prefetch.cache = false;
+        }
+
+        // create a shadow element with the same value. This seems to be important for the pedantic mode. (?)
+        $shadowElement = n.TypeAhead.makeShadowElement($element);
+
+        // prefetch data
+        var suggestions = new Bloodhound(bloodhoundConfiguration);
+        var promise = suggestions.initialize();
+
+        // use shadow element to back fill field value, if it is in the fetched suggestions (why?)
+        promise.done((function ($element, suggestions) {
+            return function () {
+                n.TypeAhead.fillTypeAheadFromShadowElement($element, suggestions);
+            };
+        })($element, suggestions));
+
+
+        $element.typeahead({
+                // options
+                hint: n.TypeAhead.getHint($element),
+                highlight: n.TypeAhead.getHighlight($element),
+                minLength: n.TypeAhead.getMinLength($element)
+            },
+            {
+                // dataset
+                display: 'value',
+                source: suggestions,
+                limit: n.TypeAhead.getLimit($element),
+                templates: {
+                    suggestion: function (obj) {
+                        return "<div>" + n.TypeAhead.htmlEncode(obj.value) + "</div>";
+                    },
+                    // No message if field is not set to pedantic.
+                    notFound: (function ($_) {
+                        return function (obj) {
+                            if (!!$_.data('typeahead-pedantic'))
+                                return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
+                        };
+                    })($element)
+                }
+            });
+
+
+        // bind select and autocomplete events
+        $element.bind('typeahead:select typeahead:autocomplete', function (event, suggestion) {
+            var $shadowElement = n.TypeAhead.getShadowElement($(event.delegateTarget));
+            $shadowElement.val(suggestion.key);
+        });
+
+        // bind change event
+        if (!!$element.data('typeahead-pedantic')) {
+            // Typeahead pedantic: Only allow suggested inputs
+            $element.bind('typeahead:change', n.TypeAhead.makePedanticHandler(suggestions));
+            $element.on('keydown', (function (suggestions) {
+                return function (event) {
+                    if (event.which === 13) {
+                        n.TypeAhead.makePedanticHandler(suggestions)(event);
+                    }
+                };
+            })(suggestions));
+            // The pedantic handler will test if the shadow element has a value set (the KEY). If not, the
+            // typeahead element is cleared. Thus we have to guarantee that no value exists in the shadow
+            // element the instant the user starts typing since we don't know the outcome of the search.
+            //
+            // If we don't clear the shadow element the instant the user starts typing, and simply let the
+            // `typeahead:select` or `typeahead:autocomplete` handler set the selected value, the
+            // user might do following steps and end up in an inconsistent state:
+            //
+            //  1. Use typeahead to select/autocomplete a suggestion
+            //  2. delete the suggestion
+            //  3. enter a random string
+            //  4. submit form
+            //
+            // This would leave a stale value in the shadow element (from step 1.), and the pedantic handler
+            // would not clear the typeahead element, giving the impression the value in the typeahead element will be submitted.
+            $element.on('input', (function ($shadowElement) {
+                return function () {
+                    $shadowElement.val('');
+                };
+            })($shadowElement));
+        } else {
+            $element.bind('typeahead:change', function (event, suggestion) {
+                var $shadowElement = n.TypeAhead.getShadowElement($(event.delegateTarget));
+                // If none pendatic, suggestion key might not exist, so use suggestion instead.
+                $shadowElement.val(suggestion.key || suggestion);
+            });
+        }
+    };
+
+
     n.TypeAhead.makePedanticHandler = function (bloodhound) {
         return function (event) {
             var $typeAhead = $(event.delegateTarget);
diff --git a/less/qfq-bs.css.less b/less/qfq-bs.css.less
index e4afadf3..39f3da3c 100644
--- a/less/qfq-bs.css.less
+++ b/less/qfq-bs.css.less
@@ -665,6 +665,11 @@ select.qfq-locked:invalid {
   width: 100%;
 }
 
+// typeAhead tags
+span.qfq-typeahead-tag {
+  margin-right: 5px;
+}
+
 @media (min-width: 768px) {
   .form-horizontal .control-label {
     text-align: unset;
diff --git a/mockup/typeahead.html b/mockup/typeahead.php
similarity index 79%
rename from mockup/typeahead.html
rename to mockup/typeahead.php
index 43c43425..129bbc3d 100644
--- a/mockup/typeahead.html
+++ b/mockup/typeahead.php
@@ -124,6 +124,56 @@
 
         </div>
 
+        <?php
+
+        $tags = [
+            ['value' => "Alabama", 'key' => "AL"],
+            ['value' => "Alaska", 'key' => "AK"]
+        ];
+
+        $tagsSafeJson = htmlentities(json_encode($tags), ENT_QUOTES, 'UTF-8');
+
+        ?>
+
+        <div id="formgroup4" class="form-group">
+            <div class="col-md-2">
+                <label for="tags1" class="control-label">Text input 4 (tags)</label>
+            </div>
+
+            <div class="col-md-6">
+                <input id="tags1" type="text" class="form-control qfq-typeahead" name="tags1"
+                       data-typeahead-sip="abcdef"
+                       data-typeahead-limit="10"
+                       data-typeahead-minlength="1"
+
+                       data-typeahead-tags="true"
+                       data-typeahead-tag-delimiters="[9, 13]"
+                       value="<?php echo $tagsSafeJson; ?>"
+                       >
+            </div>
+
+        </div>
+
+        <div id="formgroup5" class="form-group">
+            <div class="col-md-2">
+                <label for="tags2" class="control-label">Text input 4 (tags, pedantic)</label>
+            </div>
+
+            <div class="col-md-6">
+                <input id="tags2" type="text" class="form-control qfq-typeahead" name="tags2"
+                       data-typeahead-sip="abcdef"
+                       data-typeahead-limit="10"
+                       data-typeahead-minlength="1"
+
+                       data-typeahead-tags="true"
+                       data-typeahead-pedantic="true"
+                       data-typeahead-tag-delimiters="[9, 44]"
+                       value="<?php echo $tagsSafeJson; ?>"
+                >
+            </div>
+
+        </div>
+
     </form>
 </div>
 
-- 
GitLab


From 2093d735775ffbabda3d91981b732d2d875958bc Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Mon, 10 Feb 2020 14:41:01 +0100
Subject: [PATCH 11/48] add development documentation for tag field
 implementation

---
 Documentation-develop/HTML.md | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/Documentation-develop/HTML.md b/Documentation-develop/HTML.md
index 5937922f..53d0003d 100644
--- a/Documentation-develop/HTML.md
+++ b/Documentation-develop/HTML.md
@@ -65,3 +65,34 @@ Use with LDAP: `typeAheadLdap`
 
 * Defines the string minlegth, typed by the user, before the first lookup is started. Default is 2.
  
+### data-typeahead-pedantic
+
+* If present, only suggested values are allowed in the input element
+
+
+## Tags Form Element
+ 
+The tags form element depends on Typeahead by default. The following attributes define the tags form element, additional to the attributes for Typeahead (see above).
+
+Mockups can be found in `mockup/typahead.php`
+
+### .data-typeahead-tags
+
+* If present, the field becomes a tag field
+
+### .data-typeahead-tag-delimiters
+
+* List of ascii key codes of the keys which may be pressed to add a new tag when typing.
+
+### .value
+
+* JSON encoded list of key value pairs of existing tags. e.g. 
+  
+  `[{value: "Alaska", key: "AK"}, {value: "Alabama", key: "AL"}]`
+  
+### POST data
+
+* JSON encoded list of key value pairs of the selected tags. e.g.
+
+  `[{value: "Alaska", key: "AK"}, {value: "Alabama", key: "AL"}]`
+
-- 
GitLab


From f29f1a8a0b46a1119942ce87b5241ca3e5f1ff7e Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 11 Feb 2020 22:24:46 +0100
Subject: [PATCH 12/48] remove empty lines

---
 extension/Classes/Core/Report/Download.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/Classes/Core/Report/Download.php b/extension/Classes/Core/Report/Download.php
index 73ce2f23..41ba8511 100644
--- a/extension/Classes/Core/Report/Download.php
+++ b/extension/Classes/Core/Report/Download.php
@@ -413,10 +413,8 @@ class Download {
 
         $qfq = new QuickFormQuery([T3DATA_BODYTEXT => $tt_content[T3DATA_BODYTEXT]], false, false);
         return $qfq->process();
-
     }
 
-
     /**
      * Creates a ZIP Files of all given $files
      *
-- 
GitLab


From c773dbb847527ac4af76f060fc434512a0e46e5f Mon Sep 17 00:00:00 2001
From: bbaer <bbaer@math.uzh.ch>
Date: Wed, 12 Feb 2020 14:29:06 +0100
Subject: [PATCH 13/48] replaced glyphicons with font awesome for fabric

---
 .../Resources/Public/Json/fabric.buttons.json | 22 +++++++++----------
 javascript/src/Plugins/qfq.fabric.js          |  4 ++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/extension/Resources/Public/Json/fabric.buttons.json b/extension/Resources/Public/Json/fabric.buttons.json
index 5dd0f782..3ebb0ae7 100644
--- a/extension/Resources/Public/Json/fabric.buttons.json
+++ b/extension/Resources/Public/Json/fabric.buttons.json
@@ -11,7 +11,7 @@
             "toggleElement": "",
             "disabled": false,
             "tooltip": "Draw with a pencil",
-            "icon": "glyphicon-pencil"
+            "icon": "fa-pencil"
         },
         {
             "name": "highlight",
@@ -24,7 +24,7 @@
             "toggleElement": "",
             "disabled": false,
             "tooltip": "Highlighter",
-            "icon": "glyphicon-pencil"
+            "icon": "fa-paint-brush"
         },
 
         {
@@ -38,7 +38,7 @@
           "toggleElement": "emojiContainer",
           "disabled": false,
           "tooltip": "Emojis",
-          "icon": "glyphicon-ice-lolly-tasted"
+          "icon": "fa-smile-o"
         },
         {
             "name": "rectangle",
@@ -51,7 +51,7 @@
             "toggleElement": "",
           "disabled": false,
           "tooltip": "Draw a rectangle to highlight areas",
-            "icon": "glyphicon-stop"
+            "icon": "fa-square-o"
         },
       {
         "name": "write",
@@ -64,7 +64,7 @@
         "toggleElement": "",
         "disabled": false,
         "tooltip": "Adds a customizable text to canvas",
-        "icon": "glyphicon-text-height"
+        "icon": "fa-i-cursor"
       },
         {
             "name": "move",
@@ -77,7 +77,7 @@
             "toggleElement": "",
           "disabled": false,
           "tooltip": "Move the viewport, useful if zoomed",
-            "icon": "glyphicon-move"
+            "icon": "fa-arrows"
         },
         {
             "name": "delete",
@@ -90,7 +90,7 @@
             "toggleElement": "",
           "disabled": false,
           "tooltip": "Delete selected object",
-            "icon": "glyphicon-trash"
+            "icon": "fa-eraser"
         },
         {
           "name": "zoom",
@@ -103,7 +103,7 @@
           "toggleElement": "",
           "disabled": false,
           "tooltip": "Zoom viewport",
-          "icon": "glyphicon-search"
+          "icon": "fa-search-plus"
         },
       {
         "name": "freeMouse",
@@ -116,7 +116,7 @@
         "toggleElement": "",
         "disabled": false,
         "tooltip": "Normal mouse to select objects in canvas",
-        "icon": "glyphicon-hand-up"
+        "icon": "fa-mouse-pointer"
       },
       {
         "name": "undo",
@@ -129,7 +129,7 @@
         "toggleElement": "",
         "disabled": true,
         "tooltip": "Undo",
-        "icon": "glyphicon-repeat icon-flipped"
+        "icon": "fa-undo"
       },
       {
         "name": "redo",
@@ -142,7 +142,7 @@
         "toggleElement": "",
         "disabled": true,
         "tooltip": "Redo",
-        "icon": "glyphicon-repeat"
+        "icon": "fa-repeat"
       }
 
     ],
diff --git a/javascript/src/Plugins/qfq.fabric.js b/javascript/src/Plugins/qfq.fabric.js
index b31404b0..44d74c59 100644
--- a/javascript/src/Plugins/qfq.fabric.js
+++ b/javascript/src/Plugins/qfq.fabric.js
@@ -98,8 +98,8 @@ $(function (n) {
                     id: o.selector,
                     class: 'btn btn-default'
                 });
-                var $symbol = $("<span>", {
-                    class: 'glyphicon ' + o.icon
+                var $symbol = $("<i>", {
+                    class: 'fa ' + o.icon
                 });
                 $button.append($symbol);
                 if (o.name === that.myModes.currentMode) {
-- 
GitLab


From 233d74b26930b4d6b26bdd8bd8b59264b5ca46b2 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 12 Feb 2020 19:46:00 +0100
Subject: [PATCH 14/48] Fix some typo.

---
 Documentation-develop/HTML.md | 8 +++++---
 Documentation/Manual.rst      | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation-develop/HTML.md b/Documentation-develop/HTML.md
index 53d0003d..51294185 100644
--- a/Documentation-develop/HTML.md
+++ b/Documentation-develop/HTML.md
@@ -59,11 +59,12 @@ Use with LDAP: `typeAheadLdap`
  
 ### .data-typeahead-limit
 
-* Defines the limit of entries shown on the client. Default on client is 5. The server will always send a value. The server default is 20.
+* Defines the limit of entries shown on the client. Default on client is 5. The server will always send a value. 
+  The server default is 20.
 
 ### .data-typeahead-minlength
 
-* Defines the string minlegth, typed by the user, before the first lookup is started. Default is 2.
+* Defines the string minlength, typed by the user, before the first lookup is started. Default is 2.
  
 ### data-typeahead-pedantic
 
@@ -72,7 +73,8 @@ Use with LDAP: `typeAheadLdap`
 
 ## Tags Form Element
  
-The tags form element depends on Typeahead by default. The following attributes define the tags form element, additional to the attributes for Typeahead (see above).
+The tags form element depends on Typeahead by default. The following attributes define the tags form element, additional 
+to the attributes for Typeahead (see above).
 
 Mockups can be found in `mockup/typahead.php`
 
diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 53ecce4b..36895b1d 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -2146,7 +2146,7 @@ This situation also applies in *pedantic* mode to verify the user input after ea
 PerToken
 ^^^^^^^^
 
-Sometimes a LDAP server only provides attributes like 'sn' and 'givenName', but not 'displayName' or another practial
+Sometimes a LDAP server only provides attributes like 'sn' and 'givenName', but not 'displayName' or another practical
 combination of multiple attributes - than it is difficult to search for 'firstname' *and* (=human AND) 'lastname'.
 E.g. 'John Doe', results to search like `(|(sn=*John Doe*)(givenName=*John Doe*))` which will be probably always be empty.
 Instead, the user input has to be split in token and the search string has to repeated for every token.
-- 
GitLab


From 7658d95af25aaf2f7389901f04e4732bc5197377 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 12 Feb 2020 23:39:31 +0100
Subject: [PATCH 15/48] Refs #9517. First server side implementation of
 TypeAhead Tag. OK: Load & Save tag list as a string. Broken: update after
 save.

---
 extension/Classes/Core/AbstractBuildForm.php  |  63 +++++++----
 extension/Classes/Core/Constants.php          |   4 +
 .../Classes/Core/Store/FillStoreForm.php      | 102 +++++++++++-------
 3 files changed, 110 insertions(+), 59 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 8a444b17..e7fc5d38 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -1318,8 +1318,23 @@ abstract class AbstractBuildForm {
         $class = 'form-control';
         $elementCharacterCount = '';
 
-        $typeAheadUrlParam = $this->typeAheadBuildParam($formElement);
-        if ($typeAheadUrlParam != '') {
+        if ($formElement[FE_MAX_LENGTH] > 0 && $value !== '') {
+            // crop string only if it's not empty (substr returns false on empty strings)
+            $value = mb_substr($value, 0, $formElement[FE_MAX_LENGTH]);
+        }
+
+        if ($formElement[FE_HIDE_ZERO] != '0' && $value == '0') {
+            $value = '';
+        }
+
+        if ($formElement[FE_DECIMAL_FORMAT] !== '') {
+            if ($value !== '') { // empty string causes exception in number_format()
+                $decimalScale = explode(',', $formElement[FE_DECIMAL_FORMAT])[1]; // scale: Nachkommastellen
+                $value = number_format($value, $decimalScale, '.', '');
+            }
+        }
+
+        if ('' != ($typeAheadUrlParam = $this->typeAheadBuildParam($formElement))) {
 
             if (empty($formElement[FE_INPUT_TYPE])) {
                 $formElement[FE_INPUT_TYPE] = FE_TYPE_SEARCH; // typeahead behaves better with 'search' instead of 'text'
@@ -1334,9 +1349,24 @@ abstract class AbstractBuildForm {
             $attribute .= Support::doAttribute(DATA_TYPEAHEAD_SIP, $dataSip);
             $attribute .= Support::doAttribute(DATA_TYPEAHEAD_LIMIT, $formElement[FE_TYPEAHEAD_LIMIT]);
             $attribute .= Support::doAttribute(DATA_TYPEAHEAD_MINLENGTH, $formElement[FE_TYPEAHEAD_MINLENGTH]);
-            if (isset($formElement[FE_TYPEAHEAD_PEDANTIC]) && $formElement[FE_TYPEAHEAD_PEDANTIC] === '1') {
+            if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_PEDANTIC] ?? '-')) {
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_PEDANTIC, 'true');
             }
+
+            // Tag
+            if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) {
+                $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG, 'true');
+                $kk = '[' . ($formElement[FE_TYPEAHEAD_TAG_DELIMITER] ?? '9,44') . ']';
+                $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG_DELIMITER, $kk);
+
+                // TAG handling expects the '$value' as a JSON string.
+                $kk = KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
+                $jj = '';
+                foreach ($kk as $arrKey => $arrValue) {
+                    $jj .= ',' . json_encode(["key" => $arrKey, "value" => $arrValue]);
+                }
+                $value = '[' . substr($jj, 1) . ']';
+            }
         }
 
         if (isset($formElement[FE_CHARACTER_COUNT_WRAP])) {
@@ -1364,26 +1394,11 @@ abstract class AbstractBuildForm {
             $attribute .= Support::doAttribute('data-match', '[name=' . str_replace(':', '\\:', $htmlFormElementNamePrimary) . ']');
         }
 
-        if ($formElement[FE_MAX_LENGTH] > 0 && $value !== '') {
-            // crop string only if it's not empty (substr returns false on empty strings)
-            $value = mb_substr($value, 0, $formElement[FE_MAX_LENGTH]);
-        }
         // 'maxLength' needs an upper 'L': naming convention for DB tables!
         if ($formElement[FE_MAX_LENGTH] > 0) {
             $attribute .= Support::doAttribute('maxlength', $formElement[FE_MAX_LENGTH], false);
         }
 
-        if ($formElement[FE_HIDE_ZERO] != '0' && $value == '0') {
-            $value = '';
-        }
-
-        if ($formElement[FE_DECIMAL_FORMAT] !== '') {
-            if ($value !== '') { // empty string causes exception in number_format()
-                $decimalScale = explode(',', $formElement[FE_DECIMAL_FORMAT])[1]; // scale: Nachkommastellen
-                $value = number_format($value, $decimalScale, '.', '');
-            }
-        }
-
         // In case the user specifies MIN & MAX with numbers, the html tag 'type' has to be 'number', to make the range check work in the browser.
         if (empty($formElement[FE_INPUT_TYPE]) && !empty($formElement[FE_MIN]) && !empty($formElement[FE_MAX]) &&
             is_numeric($formElement[FE_MIN]) && is_numeric($formElement[FE_MAX])
@@ -1443,7 +1458,6 @@ abstract class AbstractBuildForm {
             $attribute .= Support::doAttribute(F_FE_DATA_PATTERN_ERROR, $formElement[F_FE_DATA_PATTERN_ERROR], true, ESCAPE_WITH_BACKSLASH);
         }
 
-
         if ($formElement[FE_MODE] == FE_MODE_REQUIRED) {
             $attribute .= Support::doAttribute(F_FE_DATA_REQUIRED_ERROR, $formElement[F_FE_DATA_REQUIRED_ERROR]);
         }
@@ -1503,11 +1517,10 @@ abstract class AbstractBuildForm {
 
         if (isset($formElement[FE_TYPEAHEAD_SQL])) {
             $sql = $this->checkSqlAppendLimit($formElement[FE_TYPEAHEAD_SQL], $formElement[FE_TYPEAHEAD_LIMIT]);
-            $formElement[FE_TYPEAHEAD_SQL_PREFETCH] = Support::setIfNotSet($formElement, FE_TYPEAHEAD_SQL_PREFETCH);
 
             $arr = [
                 FE_TYPEAHEAD_SQL => $sql,
-                FE_TYPEAHEAD_SQL_PREFETCH => $formElement[FE_TYPEAHEAD_SQL_PREFETCH]
+                FE_TYPEAHEAD_SQL_PREFETCH => $formElement[FE_TYPEAHEAD_SQL_PREFETCH] ?? ''
             ];
         } elseif (isset($formElement[FE_TYPEAHEAD_LDAP])) {
             $formElement[FE_LDAP_SERVER] = Support::setIfNotSet($formElement, FE_LDAP_SERVER);
@@ -1566,6 +1579,14 @@ abstract class AbstractBuildForm {
         $sqlTest = '';
 
         $sql = trim($sql);
+        // If exist, unwrap  '{{!', '}}'
+        if (substr($sql, 0, 2) == '{{') {
+            $sql = trim(substr($sql, 2, strlen($sql) - 4));
+
+            if ($sql[0] ?? '' == '!') {
+                $sql = trim(substr($sql, 1));
+            }
+        }
 
         if ($sql[0] == '[') {
             // Remove optional existing dbIndex token.
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index 9dc69fca..09143203 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -858,6 +858,8 @@ const DATA_ENABLE_SAVE_BUTTON = 'data-enable-save-button';
 const DATA_TYPEAHEAD_LIMIT = 'data-typeahead-limit';
 const DATA_TYPEAHEAD_MINLENGTH = 'data-typeahead-minlength';
 const DATA_TYPEAHEAD_PEDANTIC = 'data-typeahead-pedantic';
+const DATA_TYPEAHEAD_TAG = 'data-typeahead-tags';
+const DATA_TYPEAHEAD_TAG_DELIMITER = 'data-typeahead-tag-delimiters';
 
 const CLASS_CHARACTER_COUNT = 'qfq-character-count';
 const DATA_CHARACTER_COUNT_ID = 'data-character-count-id';
@@ -1237,6 +1239,8 @@ const FE_LDAP_USE_BIND_CREDENTIALS = F_LDAP_USE_BIND_CREDENTIALS;
 const FE_TYPEAHEAD_LIMIT = F_TYPEAHEAD_LIMIT;
 const FE_TYPEAHEAD_MINLENGTH = F_TYPEAHEAD_MINLENGTH;
 const FE_TYPEAHEAD_PEDANTIC = F_TYPEAHEAD_PEDANTIC;
+const FE_TYPEAHEAD_TAG = 'typeAheadTag';
+const FE_TYPEAHEAD_TAG_DELIMITER = 'typeAheadTagDelimiter';
 const FE_TYPEAHEAD_SQL = 'typeAheadSql';
 const FE_TYPEAHEAD_SQL_PREFETCH = 'typeAheadSqlPrefetch';
 const FE_TYPEAHEAD_LDAP_VALUE_PRINTF = F_TYPEAHEAD_LDAP_VALUE_PRINTF;
diff --git a/extension/Classes/Core/Store/FillStoreForm.php b/extension/Classes/Core/Store/FillStoreForm.php
index bb794356..1de0e536 100644
--- a/extension/Classes/Core/Store/FillStoreForm.php
+++ b/extension/Classes/Core/Store/FillStoreForm.php
@@ -11,6 +11,7 @@ namespace IMATHUZH\Qfq\Core\Store;
 use IMATHUZH\Qfq\Core\Database\Database;
 use IMATHUZH\Qfq\Core\Evaluate;
 use IMATHUZH\Qfq\Core\Helper\HelperFormElement;
+use IMATHUZH\Qfq\Core\Helper\KeyValueStringParser;
 use IMATHUZH\Qfq\Core\Helper\Logger;
 use IMATHUZH\Qfq\Core\Helper\Sanitize;
 use IMATHUZH\Qfq\Core\Helper\Support;
@@ -292,45 +293,21 @@ class FillStoreForm {
                     $formElement[FE_MODE] === FE_MODE_SHOW ||
                     (isset($formElement[FE_PROCESS_READ_ONLY]) && $formElement[FE_PROCESS_READ_ONLY] != '0')) {
 
-                    $val = $clientValues[$clientFieldName];
+                    if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) {
+                        // TYPEAHEAD_TAG will be delivered as JSON. Check and sanitize every key/value pair.
+                        $arr = json_decode($clientValues[$clientFieldName], true);
+                        $arrTmp = array();
+                        foreach ($arr as $row) {
 
-                    // Trim input
-                    if (empty($formElement[FE_TRIM])) {
-                        $val = trim($val);
-                    } elseif ($formElement[FE_TRIM] !== FE_TRIM_NONE) {
-                        $val = trim($val, $formElement[FE_TRIM]);
-                    }
-
-                    switch ($formElement[FE_TYPE]) {
-                        case FE_TYPE_DATE:
-                        case FE_TYPE_DATETIME:
-                        case FE_TYPE_TIME:
-                            if ($clientValues[$clientFieldName] !== '') { // do not check empty values
-                                $val = $this->doDateTime($formElement, $val);
-                            }
-                            break;
-
-                        default:
-                            if ($formElement[FE_TYPE] == FE_TYPE_EDITOR) {
-                                // Tiny MCE always wrap a '<p>' around the content. Remove it before saving.
-                                $val = Support::unWrapTag('<p>', $val);
-                            }
-
-                            // Check only if there is something.
-                            if ($val !== '' && $formMode != FORM_UPDATE && $formElement[FE_MODE] != FE_MODE_HIDDEN) {
-                                $val = Sanitize::sanitize($val, $formElement[FE_CHECK_TYPE], $formElement[FE_CHECK_PATTERN],
-                                    $formElement[FE_DECIMAL_FORMAT], SANITIZE_EXCEPTION, $formElement[F_FE_DATA_PATTERN_ERROR] ?? '');
-
-                                if ($formElement[FE_ENCODE] === FE_ENCODE_SPECIALCHAR) {
-//                                    $val = htmlspecialchars($val, ENT_QUOTES);
-                                    $val = Support::htmlEntityEncodeDecode(MODE_ENCODE, $val);
-                                }
-                            }
-                            break;
-                    }
+                            $arrKey = $this->doValue($formElement, $formMode, $row['key']);
+                            $arrValue = $this->doValue($formElement, $formMode, $row['value']);
+                            $arrTmp[$arrKey] = $arrValue;
+                        }
+                        $val = KeyValueStringParser::unparse($arrTmp);
 
-                    if ($val !== '') {
-                        $val = Sanitize::checkMinMax($val, $formElement[FE_MIN], $formElement[FE_MAX], SANITIZE_EXCEPTION);
+                    } else {
+                        // Single Value
+                        $val = $this->doValue($formElement, $formMode, $clientValues[$clientFieldName]);
                     }
 
                     $newValues[$formElement[FE_NAME]] = $val;
@@ -342,6 +319,56 @@ class FillStoreForm {
 
     }
 
+    /**
+     * @param $formElement
+     * @param $value
+     * @return string
+     * @throws \CodeException
+     * @throws \UserFormException
+     */
+    private function doValue($formElement, $formMode, $value) {
+        // Trim input
+        if (empty($formElement[FE_TRIM])) {
+            $value = trim($value);
+        } elseif ($formElement[FE_TRIM] !== FE_TRIM_NONE) {
+            $value = trim($value, $formElement[FE_TRIM]);
+        }
+
+        switch ($formElement[FE_TYPE]) {
+            case FE_TYPE_DATE:
+            case FE_TYPE_DATETIME:
+            case FE_TYPE_TIME:
+                if ($value !== '') { // do not check empty values
+                    $value = $this->doDateTime($formElement, $value);
+                }
+                break;
+
+            default:
+                if ($formElement[FE_TYPE] == FE_TYPE_EDITOR) {
+                    // Tiny MCE always wrap a '<p>' around the content. Remove it before saving.
+                    $value = Support::unWrapTag('<p>', $value);
+                }
+
+                // Check only if there is something.
+                if ($value !== '' && $formMode != FORM_UPDATE && $formElement[FE_MODE] != FE_MODE_HIDDEN) {
+                    $value = Sanitize::sanitize($value, $formElement[FE_CHECK_TYPE], $formElement[FE_CHECK_PATTERN],
+                        $formElement[FE_DECIMAL_FORMAT], SANITIZE_EXCEPTION, $formElement[F_FE_DATA_PATTERN_ERROR] ?? '');
+
+                    if ($formElement[FE_ENCODE] === FE_ENCODE_SPECIALCHAR) {
+//                                    $value = htmlspecialchars($value, ENT_QUOTES);
+                        $value = Support::htmlEntityEncodeDecode(MODE_ENCODE, $value);
+                    }
+                }
+                break;
+        }
+
+        if ($value !== '') {
+            $value = Sanitize::checkMinMax($value, $formElement[FE_MIN], $formElement[FE_MAX], SANITIZE_EXCEPTION);
+        }
+
+        return $value;
+    }
+
     /**
      * Steps through all $clientValues (POST vars) and collect all with the name _?_${clientFieldName} in a comma
      * separated string (MYSQL ENUM type). If there is no element '_h_${clientFieldName}', than there are no multi
@@ -369,7 +396,6 @@ class FillStoreForm {
         return $unchecked;
 
 
-
         // For templateGroups: all expanded FormElements will be tried to collect - this fails for not submitted fields.
         // Therefore skip not existing clientvalues.
         if (!isset($clientValues[$checkboxKey])) {
-- 
GitLab


From 4e0a1025f42a95b5afdc533a6d7e32180c13765e Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Thu, 13 Feb 2020 13:58:22 +0100
Subject: [PATCH 16/48] refs #10117

---
 javascript/src/ElementUpdate.js |  1 +
 javascript/src/TypeAhead.js     | 39 +++++++++++++++++++++++----------
 mockup/typeahead.php            |  4 ++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/javascript/src/ElementUpdate.js b/javascript/src/ElementUpdate.js
index 2d8fe787..ccf09d47 100644
--- a/javascript/src/ElementUpdate.js
+++ b/javascript/src/ElementUpdate.js
@@ -79,6 +79,7 @@ var QfqNS = QfqNS || {};
         $element.attr(attributeName, attributeValue);
         if (attributeName.toLowerCase() === "value") {
             $element.val(attributeValue);
+            $element.trigger('qfqChange');
         }
     };
 
diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index c510eea2..2a3db19a 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -62,9 +62,16 @@ var QfqNS = QfqNS || {};
         var suggestions = new Bloodhound(bloodhoundConfiguration);
         suggestions.initialize();
 
+        // create actual input field
+        var $inputField = $('<input/>', {
+            type: 'text',
+            class: $element.attr('class')
+        });
+        $element.after($inputField);
+
         // prevent form submit when enter key is pressed
-        $element.off('keyup');
-        $element.on('keypress keyup', function (e) {
+        $inputField.off('keyup');
+        $inputField.on('keypress keyup', function (e) {
             var code = e.keyCode || e.which;
             if (code === 13) {
                 e.preventDefault();
@@ -91,9 +98,9 @@ var QfqNS = QfqNS || {};
         };
 
         // initialize tagsManager
-        var tagApi = $element.tagsManager({
+        var tagApi = $inputField.tagsManager({
             deleteTagsOnBackspace: false,
-            hiddenTagListName: $element.attr('name'),
+            hiddenTagListName: '',
             tagClass: 'qfq-typeahead-tag',
             delimiters: delimiters,
             validator: !!$element.data('typeahead-pedantic') ? pedanticValidator : null,
@@ -110,13 +117,21 @@ var QfqNS = QfqNS || {};
         });
 
         // when the hidden input field changes, overwrite value with tag object list
-        tagApi.bind('tm:hiddenUpdate', function (e, tags, hiddenInput) {
+        tagApi.bind('tm:hiddenUpdate', function (e, tags) {
             var tagObjects = $.map(tags, function (t) {
                 return existingTags.filter(function (tt) {return tt.value === t;})[0];
             });
-            hiddenInput.val(JSON.stringify(tagObjects));
+            $element.val(JSON.stringify(tagObjects));
+        });
+
+        // if value of hidden field is changed externally, update tagManager
+        $element.on('qfqChange', function () {
+           existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
+           tagApi.tagsManager('empty');
+           $.each(existingTags, function (i, tag) {
+               tagApi.tagsManager('pushTag', tag.value);
+           });
         });
-        $element.removeAttr('name');
 
         // add existing tags
         $.each(existingTags, function (i, tag) {
@@ -124,7 +139,7 @@ var QfqNS = QfqNS || {};
         });
 
         // add typahead
-        $element.typeahead({
+        $inputField.typeahead({
                 // options
                 hint: n.TypeAhead.getHint($element),
                 highlight: n.TypeAhead.getHighlight($element),
@@ -140,20 +155,20 @@ var QfqNS = QfqNS || {};
                     // No message if field is not set to pedantic.
                     notFound: (function ($_) {
                         return function (obj) {
-                            if (!!$_.data('typeahead-pedantic'))
+                            if (!!$element.data('typeahead-pedantic'))
                                 return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
                         };
-                    })($element)
+                    })($inputField)
             }
         });
 
         // directly add tag when clicked on in typahead menu
-        $element.bind('typeahead:selected', function (event, sugg) {
+        $inputField.bind('typeahead:selected', function (event, sugg) {
             tagApi.tagsManager("pushTag", sugg.value);
         });
 
         // update typahead list when typahead changes
-        $element.bind('typeahead:render', function (event, sugg) {
+        $inputField.bind('typeahead:render', function (event, sugg) {
             typeaheadList.length = 0;
             typeaheadList.push.apply(typeaheadList, sugg);
         });
diff --git a/mockup/typeahead.php b/mockup/typeahead.php
index 129bbc3d..1b57f98f 100644
--- a/mockup/typeahead.php
+++ b/mockup/typeahead.php
@@ -141,7 +141,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags1" type="text" class="form-control qfq-typeahead" name="tags1"
+                <input id="tags1" type="hidden" class="form-control qfq-typeahead" name="tags1"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
@@ -160,7 +160,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags2" type="text" class="form-control qfq-typeahead" name="tags2"
+                <input id="tags2" type="hidden" class="form-control qfq-typeahead" name="tags2"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
-- 
GitLab


From 221ee74e75fcd9066d16e169a8ba1d272f686097 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Thu, 13 Feb 2020 15:17:46 +0100
Subject: [PATCH 17/48] add info upcoming tag 'i'

---
 extension/Classes/Core/Report/Link.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/Classes/Core/Report/Link.php b/extension/Classes/Core/Report/Link.php
index 1e6a5520..8e6e0e04 100644
--- a/extension/Classes/Core/Report/Link.php
+++ b/extension/Classes/Core/Report/Link.php
@@ -49,7 +49,7 @@ use IMATHUZH\Qfq\Core\Store\Store;
  * G:Glyph
  * h:
  * H:Help
- * i:
+ * i:icon (Font Awesome, t)
  * I:information
  * j:
  * J:
-- 
GitLab


From a0d1a5758d6a720d94bb8cc7a982269a0e2b90df Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Thu, 13 Feb 2020 17:36:56 +0100
Subject: [PATCH 18/48] Revert "refs #10117" This makes me sad

This reverts commit 4e0a1025
---
 javascript/src/ElementUpdate.js |  1 -
 javascript/src/TypeAhead.js     | 39 ++++++++++-----------------------
 mockup/typeahead.php            |  4 ++--
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/javascript/src/ElementUpdate.js b/javascript/src/ElementUpdate.js
index ccf09d47..2d8fe787 100644
--- a/javascript/src/ElementUpdate.js
+++ b/javascript/src/ElementUpdate.js
@@ -79,7 +79,6 @@ var QfqNS = QfqNS || {};
         $element.attr(attributeName, attributeValue);
         if (attributeName.toLowerCase() === "value") {
             $element.val(attributeValue);
-            $element.trigger('qfqChange');
         }
     };
 
diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index 2a3db19a..c510eea2 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -62,16 +62,9 @@ var QfqNS = QfqNS || {};
         var suggestions = new Bloodhound(bloodhoundConfiguration);
         suggestions.initialize();
 
-        // create actual input field
-        var $inputField = $('<input/>', {
-            type: 'text',
-            class: $element.attr('class')
-        });
-        $element.after($inputField);
-
         // prevent form submit when enter key is pressed
-        $inputField.off('keyup');
-        $inputField.on('keypress keyup', function (e) {
+        $element.off('keyup');
+        $element.on('keypress keyup', function (e) {
             var code = e.keyCode || e.which;
             if (code === 13) {
                 e.preventDefault();
@@ -98,9 +91,9 @@ var QfqNS = QfqNS || {};
         };
 
         // initialize tagsManager
-        var tagApi = $inputField.tagsManager({
+        var tagApi = $element.tagsManager({
             deleteTagsOnBackspace: false,
-            hiddenTagListName: '',
+            hiddenTagListName: $element.attr('name'),
             tagClass: 'qfq-typeahead-tag',
             delimiters: delimiters,
             validator: !!$element.data('typeahead-pedantic') ? pedanticValidator : null,
@@ -117,21 +110,13 @@ var QfqNS = QfqNS || {};
         });
 
         // when the hidden input field changes, overwrite value with tag object list
-        tagApi.bind('tm:hiddenUpdate', function (e, tags) {
+        tagApi.bind('tm:hiddenUpdate', function (e, tags, hiddenInput) {
             var tagObjects = $.map(tags, function (t) {
                 return existingTags.filter(function (tt) {return tt.value === t;})[0];
             });
-            $element.val(JSON.stringify(tagObjects));
-        });
-
-        // if value of hidden field is changed externally, update tagManager
-        $element.on('qfqChange', function () {
-           existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
-           tagApi.tagsManager('empty');
-           $.each(existingTags, function (i, tag) {
-               tagApi.tagsManager('pushTag', tag.value);
-           });
+            hiddenInput.val(JSON.stringify(tagObjects));
         });
+        $element.removeAttr('name');
 
         // add existing tags
         $.each(existingTags, function (i, tag) {
@@ -139,7 +124,7 @@ var QfqNS = QfqNS || {};
         });
 
         // add typahead
-        $inputField.typeahead({
+        $element.typeahead({
                 // options
                 hint: n.TypeAhead.getHint($element),
                 highlight: n.TypeAhead.getHighlight($element),
@@ -155,20 +140,20 @@ var QfqNS = QfqNS || {};
                     // No message if field is not set to pedantic.
                     notFound: (function ($_) {
                         return function (obj) {
-                            if (!!$element.data('typeahead-pedantic'))
+                            if (!!$_.data('typeahead-pedantic'))
                                 return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
                         };
-                    })($inputField)
+                    })($element)
             }
         });
 
         // directly add tag when clicked on in typahead menu
-        $inputField.bind('typeahead:selected', function (event, sugg) {
+        $element.bind('typeahead:selected', function (event, sugg) {
             tagApi.tagsManager("pushTag", sugg.value);
         });
 
         // update typahead list when typahead changes
-        $inputField.bind('typeahead:render', function (event, sugg) {
+        $element.bind('typeahead:render', function (event, sugg) {
             typeaheadList.length = 0;
             typeaheadList.push.apply(typeaheadList, sugg);
         });
diff --git a/mockup/typeahead.php b/mockup/typeahead.php
index 1b57f98f..129bbc3d 100644
--- a/mockup/typeahead.php
+++ b/mockup/typeahead.php
@@ -141,7 +141,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags1" type="hidden" class="form-control qfq-typeahead" name="tags1"
+                <input id="tags1" type="text" class="form-control qfq-typeahead" name="tags1"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
@@ -160,7 +160,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags2" type="hidden" class="form-control qfq-typeahead" name="tags2"
+                <input id="tags2" type="text" class="form-control qfq-typeahead" name="tags2"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
-- 
GitLab


From 2890924bd5bc5d402d1259016a250554d9fbd616 Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Fri, 14 Feb 2020 17:45:22 +0100
Subject: [PATCH 19/48] Revert "Revert "refs #10117" Double revert yay

This reverts commit a0d1a575
---
 javascript/src/ElementUpdate.js |  1 +
 javascript/src/TypeAhead.js     | 39 +++++++++++++++++++++++----------
 mockup/typeahead.php            |  4 ++--
 3 files changed, 30 insertions(+), 14 deletions(-)

diff --git a/javascript/src/ElementUpdate.js b/javascript/src/ElementUpdate.js
index 2d8fe787..ccf09d47 100644
--- a/javascript/src/ElementUpdate.js
+++ b/javascript/src/ElementUpdate.js
@@ -79,6 +79,7 @@ var QfqNS = QfqNS || {};
         $element.attr(attributeName, attributeValue);
         if (attributeName.toLowerCase() === "value") {
             $element.val(attributeValue);
+            $element.trigger('qfqChange');
         }
     };
 
diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index c510eea2..2a3db19a 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -62,9 +62,16 @@ var QfqNS = QfqNS || {};
         var suggestions = new Bloodhound(bloodhoundConfiguration);
         suggestions.initialize();
 
+        // create actual input field
+        var $inputField = $('<input/>', {
+            type: 'text',
+            class: $element.attr('class')
+        });
+        $element.after($inputField);
+
         // prevent form submit when enter key is pressed
-        $element.off('keyup');
-        $element.on('keypress keyup', function (e) {
+        $inputField.off('keyup');
+        $inputField.on('keypress keyup', function (e) {
             var code = e.keyCode || e.which;
             if (code === 13) {
                 e.preventDefault();
@@ -91,9 +98,9 @@ var QfqNS = QfqNS || {};
         };
 
         // initialize tagsManager
-        var tagApi = $element.tagsManager({
+        var tagApi = $inputField.tagsManager({
             deleteTagsOnBackspace: false,
-            hiddenTagListName: $element.attr('name'),
+            hiddenTagListName: '',
             tagClass: 'qfq-typeahead-tag',
             delimiters: delimiters,
             validator: !!$element.data('typeahead-pedantic') ? pedanticValidator : null,
@@ -110,13 +117,21 @@ var QfqNS = QfqNS || {};
         });
 
         // when the hidden input field changes, overwrite value with tag object list
-        tagApi.bind('tm:hiddenUpdate', function (e, tags, hiddenInput) {
+        tagApi.bind('tm:hiddenUpdate', function (e, tags) {
             var tagObjects = $.map(tags, function (t) {
                 return existingTags.filter(function (tt) {return tt.value === t;})[0];
             });
-            hiddenInput.val(JSON.stringify(tagObjects));
+            $element.val(JSON.stringify(tagObjects));
+        });
+
+        // if value of hidden field is changed externally, update tagManager
+        $element.on('qfqChange', function () {
+           existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
+           tagApi.tagsManager('empty');
+           $.each(existingTags, function (i, tag) {
+               tagApi.tagsManager('pushTag', tag.value);
+           });
         });
-        $element.removeAttr('name');
 
         // add existing tags
         $.each(existingTags, function (i, tag) {
@@ -124,7 +139,7 @@ var QfqNS = QfqNS || {};
         });
 
         // add typahead
-        $element.typeahead({
+        $inputField.typeahead({
                 // options
                 hint: n.TypeAhead.getHint($element),
                 highlight: n.TypeAhead.getHighlight($element),
@@ -140,20 +155,20 @@ var QfqNS = QfqNS || {};
                     // No message if field is not set to pedantic.
                     notFound: (function ($_) {
                         return function (obj) {
-                            if (!!$_.data('typeahead-pedantic'))
+                            if (!!$element.data('typeahead-pedantic'))
                                 return "<div>'" + n.TypeAhead.htmlEncode(obj.query) + "' not found";
                         };
-                    })($element)
+                    })($inputField)
             }
         });
 
         // directly add tag when clicked on in typahead menu
-        $element.bind('typeahead:selected', function (event, sugg) {
+        $inputField.bind('typeahead:selected', function (event, sugg) {
             tagApi.tagsManager("pushTag", sugg.value);
         });
 
         // update typahead list when typahead changes
-        $element.bind('typeahead:render', function (event, sugg) {
+        $inputField.bind('typeahead:render', function (event, sugg) {
             typeaheadList.length = 0;
             typeaheadList.push.apply(typeaheadList, sugg);
         });
diff --git a/mockup/typeahead.php b/mockup/typeahead.php
index 129bbc3d..1b57f98f 100644
--- a/mockup/typeahead.php
+++ b/mockup/typeahead.php
@@ -141,7 +141,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags1" type="text" class="form-control qfq-typeahead" name="tags1"
+                <input id="tags1" type="hidden" class="form-control qfq-typeahead" name="tags1"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
@@ -160,7 +160,7 @@
             </div>
 
             <div class="col-md-6">
-                <input id="tags2" type="text" class="form-control qfq-typeahead" name="tags2"
+                <input id="tags2" type="hidden" class="form-control qfq-typeahead" name="tags2"
                        data-typeahead-sip="abcdef"
                        data-typeahead-limit="10"
                        data-typeahead-minlength="1"
-- 
GitLab


From 44896163c667eddd8d649a61f380912747795a29 Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Fri, 14 Feb 2020 19:11:15 +0100
Subject: [PATCH 20/48] refs #10115 almost fixed, now some tags get lost some
 times

---
 extension/Classes/Core/AbstractBuildForm.php |  1 +
 javascript/src/Helper/tagManager.js          | 18 ++++++++++++------
 javascript/src/TypeAhead.js                  | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index e7fc5d38..f33fd1af 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -1358,6 +1358,7 @@ abstract class AbstractBuildForm {
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG, 'true');
                 $kk = '[' . ($formElement[FE_TYPEAHEAD_TAG_DELIMITER] ?? '9,44') . ']';
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG_DELIMITER, $kk);
+                $formElement[FE_INPUT_TYPE] = 'hidden';
 
                 // TAG handling expects the '$value' as a JSON string.
                 $kk = KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
diff --git a/javascript/src/Helper/tagManager.js b/javascript/src/Helper/tagManager.js
index 11df1404..69062116 100644
--- a/javascript/src/Helper/tagManager.js
+++ b/javascript/src/Helper/tagManager.js
@@ -18,6 +18,8 @@
 
     "use strict";
 
+    var disableHiddenUpdate = false;
+
     var defaults = {
             prefilled: null,
             CapitalizeFirstLetter: false,
@@ -302,14 +304,16 @@
             },
 
             refreshHiddenTagList: function () {
-                var $self = $(this), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList");
+                if (!disableHiddenUpdate) {
+                    var $self = $(this), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList");
 
-                if (lhiddenTagList) {
-                    $(lhiddenTagList).val(tlis.join($self.data('opts').baseDelimiter)).change();
-                    $self.trigger('tm:hiddenUpdate', [tlis, $(lhiddenTagList)]);
-                }
+                    if (lhiddenTagList) {
+                        $(lhiddenTagList).val(tlis.join($self.data('opts').baseDelimiter)).change();
+                        $self.trigger('tm:hiddenUpdate', [tlis, $(lhiddenTagList)]);
+                    }
 
-                $self.trigger('tm:refresh', tlis.join($self.data('opts').baseDelimiter));
+                    $self.trigger('tm:refresh', tlis.join($self.data('opts').baseDelimiter));
+                }
             },
 
             killEvent: function (e) {
@@ -542,6 +546,8 @@
             return publicMethods[method].apply($self, Array.prototype.slice.call(arguments, 1));
         } else if (typeof method === 'object' || !method) {
             return privateMethods.init.apply(this, arguments);
+        } else if (method === 'disableHiddenUpdate') {
+            disableHiddenUpdate = arguments[1];
         } else {
             $.error('Method ' + method + ' does not exist.');
             return false;
diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index 2a3db19a..2414f49e 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -79,6 +79,16 @@ var QfqNS = QfqNS || {};
             }
         });
 
+        $element.off('keyup change');
+        $element.on('keypress keyup change', function (e) {
+            var code = e.keyCode || e.which;
+            if (code === 13) {
+                e.preventDefault();
+                return false;
+            }
+        });
+
+
         // list to keep tracks of existing tags and those added during the current session
         // expected JSON format: [{value: "Alaska", key: "AK"}, {value: "Alabama", key: "AL"}]
         var existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
@@ -116,6 +126,8 @@ var QfqNS = QfqNS || {};
             }
         });
 
+        // window.qfqChange = false;
+
         // when the hidden input field changes, overwrite value with tag object list
         tagApi.bind('tm:hiddenUpdate', function (e, tags) {
             var tagObjects = $.map(tags, function (t) {
@@ -126,11 +138,15 @@ var QfqNS = QfqNS || {};
 
         // if value of hidden field is changed externally, update tagManager
         $element.on('qfqChange', function () {
+            // window.qfqChange = true;
+            tagApi.tagsManager('disableHiddenUpdate', true);
            existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
            tagApi.tagsManager('empty');
            $.each(existingTags, function (i, tag) {
                tagApi.tagsManager('pushTag', tag.value);
            });
+           // window.qfqChange = false;
+           tagApi.tagsManager('disableHiddenUpdate', false);
         });
 
         // add existing tags
-- 
GitLab


From dbee2e6a04f737e5ec1e32090bacf930bec9811d Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Fri, 14 Feb 2020 21:02:22 +0100
Subject: [PATCH 21/48] refs #10117 solve dirty at start bug and clean up

---
 javascript/src/TypeAhead.js | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/javascript/src/TypeAhead.js b/javascript/src/TypeAhead.js
index 2414f49e..ec4f3fee 100644
--- a/javascript/src/TypeAhead.js
+++ b/javascript/src/TypeAhead.js
@@ -126,8 +126,6 @@ var QfqNS = QfqNS || {};
             }
         });
 
-        // window.qfqChange = false;
-
         // when the hidden input field changes, overwrite value with tag object list
         tagApi.bind('tm:hiddenUpdate', function (e, tags) {
             var tagObjects = $.map(tags, function (t) {
@@ -138,21 +136,21 @@ var QfqNS = QfqNS || {};
 
         // if value of hidden field is changed externally, update tagManager
         $element.on('qfqChange', function () {
-            // window.qfqChange = true;
             tagApi.tagsManager('disableHiddenUpdate', true);
-           existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
-           tagApi.tagsManager('empty');
-           $.each(existingTags, function (i, tag) {
+            existingTags = $element.val() !== '' ? JSON.parse($element.val()) : [];
+            tagApi.tagsManager('empty');
+            $.each(existingTags, function (i, tag) {
                tagApi.tagsManager('pushTag', tag.value);
-           });
-           // window.qfqChange = false;
-           tagApi.tagsManager('disableHiddenUpdate', false);
+            });
+            tagApi.tagsManager('disableHiddenUpdate', false);
         });
 
         // add existing tags
+        tagApi.tagsManager('disableHiddenUpdate', true);
         $.each(existingTags, function (i, tag) {
             tagApi.tagsManager('pushTag', tag.value);
         });
+        tagApi.tagsManager('disableHiddenUpdate', false);
 
         // add typahead
         $inputField.typeahead({
-- 
GitLab


From 2b89423c42b0584a9fd0750b4b1bdd5f5fc28c8b Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 15 Feb 2020 22:01:36 +0100
Subject: [PATCH 22/48] Merge Branch ME

---
 extension/Classes/Core/AbstractBuildForm.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index f33fd1af..12fb3ef1 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -1361,12 +1361,22 @@ abstract class AbstractBuildForm {
                 $formElement[FE_INPUT_TYPE] = 'hidden';
 
                 // TAG handling expects the '$value' as a JSON string.
+                // Old, much to complicated
                 $kk = KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
                 $jj = '';
                 foreach ($kk as $arrKey => $arrValue) {
                     $jj .= ',' . json_encode(["key" => $arrKey, "value" => $arrValue]);
                 }
                 $value = '[' . substr($jj, 1) . ']';
+
+//                $tags = [
+//                    ['value' => "Alabama", 'key' => "AL"],
+//                    ['value' => "Alaska", 'key' => "AK"]
+//                ];
+//                $tagsSafeJson = htmlentities(json_encode($tags), ENT_QUOTES, 'UTF-8');
+//
+//                $tags1=KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
+//                $tags1SafeJson = htmlentities(json_encode($tags1), ENT_QUOTES, 'UTF-8');
             }
         }
 
@@ -1440,6 +1450,7 @@ abstract class AbstractBuildForm {
             $htmlTag = '<input';
             if (!empty($formElement[FE_INPUT_TYPE])) {
                 $formElement[FE_TYPE] = $formElement[FE_INPUT_TYPE];
+                $formElement[FE_TYPE] = 'hidden';
             }
             $attribute .= HelperFormElement::getAttributeList($formElement, [FE_TYPE, 'size']);
             $attribute .= Support::doAttribute('value', htmlentities($value), false);
-- 
GitLab


From b60ee6e3a466eb7fc76e1d0023bfed126071abdb Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 16 Feb 2020 17:19:04 +0100
Subject: [PATCH 23/48] Add doc

---
 Documentation/Manual.rst             | 39 ++++++++++++++++++++++++----
 extension/Classes/Core/Constants.php |  6 +++++
 2 files changed, 40 insertions(+), 5 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 36895b1d..7cbf9c45 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -2080,15 +2080,17 @@ To decide which Parameter should be placed on *Form.parameter* and which on *For
 
 .. _LDAP_Typeahead:
 
-Typeahead (TA)
---------------
+Typeahead (TA) - LDAP
+---------------------
+
+See also `input-typeahead`_
 
-*Typeahead* offers continous searching of a LDAP directoy by using a regular *FormElement* of type *text*.
+*Typeahead* offers continuous searching of a LDAP directoy by using a regular *FormElement* of type *text*.
 The *FormElement.parameter*=*typeAheadLdap* will trigger LDAP searches on every user **keystroke**
 (starting after *typeAheadMinLength* keystrokes) for the current *FormElement* - this is different from *dynamicUpdate*
 (triggered by leaving focus of an input element). Typeahead delivers a list of elements.
 
-* *FormElement.parameter.typeAheadLdap* - activate the mode *Typeahead* - no value is needed, the existence is suffucient.
+* *FormElement.parameter.typeAheadLdap* - activate the mode *Typeahead* - no value is needed, the existence is sufficient.
 * *Form.parameter* or *FormElement.parameter*:
 
   * *ldapServer* = `directory.example.com`
@@ -3560,6 +3562,33 @@ See :ref:`LDAP_Typeahead`
 
 .. _`input-editor`:
 
+Type Ahead Tag
+""""""""""""""
+
+This extends a TypeAhead input element to take more than one token (=tag) in the same input element. The user starts
+typing and this searches a list defined by *typeAheadSql*. The user selects An element can be selected by
+
+The maximum number
+
+Usage: A user might choose multiple tags from a typeahead list (to minimize typos and to reuse already given tags).
+
+Tags might be saved in a string (primary table column as defined in *FormElement.name*
+
+* *FormElement.parameter*:
+
+  * *typeAheadTag* = [0|1] - Default 0 (=off), existence or =1 switches the mode *typeAheadTag* on.
+  * *typeAheadTagDelimiter* = List of ASCII codes to separate tags during input. Default '9,44' (tab and comma).
+  * *sqlInsertTag* = {{INSERT INTO tags (name) VALUES (?)}}
+  * *sqlInsertGlue* = {{INSERT INTO glue (name) VALUES (?)}}
+  * *slaveId* = Used in glue mode {{!SELECT
+
+
+If FormElement.name points to a primary table column, the user selected tags are saved as comma selected list
+If Parameter *sqlInsertGlue* is given, tags are assigned by glue, not by defining them directly in the string.
+
+
+
+
 Type: editor
 ^^^^^^^^^^^^
 
@@ -9226,4 +9255,4 @@ To allow it, add 'span' to the valid elements in the FormElement.parameter field
     editor-extended_valid_elements = span[class|style]
 
 The HTML span tag has to be added via 'source' view. At least in TinyMCE 4.7.13, the glyph is still not shown in the
-editor but saved.
+editor.
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index 09143203..2aab95f4 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -1241,6 +1241,12 @@ const FE_TYPEAHEAD_MINLENGTH = F_TYPEAHEAD_MINLENGTH;
 const FE_TYPEAHEAD_PEDANTIC = F_TYPEAHEAD_PEDANTIC;
 const FE_TYPEAHEAD_TAG = 'typeAheadTag';
 const FE_TYPEAHEAD_TAG_DELIMITER = 'typeAheadTagDelimiter';
+const FE_TYPEAHEAD_GLUE_INSERT = 'typeAheadGlueInsert';
+const FE_TYPEAHEAD_GLUE_TAG = 'typeAheadGlueTable';
+const FE_TYPEAHEAD_TAG_INSERT = 'typeAheadTagInsert';
+const FE_TYPEAHEAD_TAG_TABLE = 'typeAheadTagTable';
+
+
 const FE_TYPEAHEAD_SQL = 'typeAheadSql';
 const FE_TYPEAHEAD_SQL_PREFETCH = 'typeAheadSqlPrefetch';
 const FE_TYPEAHEAD_LDAP_VALUE_PRINTF = F_TYPEAHEAD_LDAP_VALUE_PRINTF;
-- 
GitLab


From 6d7528bbf983d13109d0276e1a8ec2c51dc4c9c2 Mon Sep 17 00:00:00 2001
From: Carsten Rose <carsten.rose@math.uzh.ch>
Date: Sun, 16 Feb 2020 17:21:37 +0100
Subject: [PATCH 24/48] remove empty line

---
 extension/Tests/Unit/Core/Database/AbstractDatabaseTest.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/extension/Tests/Unit/Core/Database/AbstractDatabaseTest.php b/extension/Tests/Unit/Core/Database/AbstractDatabaseTest.php
index 23c36422..0967d04a 100644
--- a/extension/Tests/Unit/Core/Database/AbstractDatabaseTest.php
+++ b/extension/Tests/Unit/Core/Database/AbstractDatabaseTest.php
@@ -113,7 +113,5 @@ abstract class AbstractDatabaseTest extends TestCase {
         if (empty($this->dbArray)) {
             $this->dbArray[DB_INDEX_DEFAULT] = new Database();
         }
-
-
     }
 }
-- 
GitLab


From 37f36a3af52d9dbc497c8bd54611ead0de5bc6af Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 16 Feb 2020 18:04:36 +0100
Subject: [PATCH 25/48] Update temporay 'hidden' to match TypeHeadTag

---
 extension/Classes/Core/AbstractBuildForm.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 12fb3ef1..85b63a5c 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -1356,6 +1356,8 @@ abstract class AbstractBuildForm {
             // Tag
             if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) {
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG, 'true');
+
+                // Default: tab, comma
                 $kk = '[' . ($formElement[FE_TYPEAHEAD_TAG_DELIMITER] ?? '9,44') . ']';
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG_DELIMITER, $kk);
                 $formElement[FE_INPUT_TYPE] = 'hidden';
@@ -1450,7 +1452,10 @@ abstract class AbstractBuildForm {
             $htmlTag = '<input';
             if (!empty($formElement[FE_INPUT_TYPE])) {
                 $formElement[FE_TYPE] = $formElement[FE_INPUT_TYPE];
-                $formElement[FE_TYPE] = 'hidden';
+                // TypeAhead tag elements needs to be hidden
+                if (HelperFormElement::booleParameter($formElement[FE_TYPEAHEAD_TAG] ?? '-')) {
+                    $formElement[FE_TYPE] = 'hidden';
+                }
             }
             $attribute .= HelperFormElement::getAttributeList($formElement, [FE_TYPE, 'size']);
             $attribute .= Support::doAttribute('value', htmlentities($value), false);
-- 
GitLab


From 9815cca0f40581a5b060b38c2d13b56a535b1dc6 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 16 Feb 2020 19:22:06 +0100
Subject: [PATCH 26/48] Manual.rst: update planned usage of typeaheadtag

---
 Documentation/Manual.rst | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 7cbf9c45..915418e9 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -3566,13 +3566,17 @@ Type Ahead Tag
 """"""""""""""
 
 This extends a TypeAhead input element to take more than one token (=tag) in the same input element. The user starts
-typing and this searches a list defined by *typeAheadSql*. The user selects An element can be selected by
+typing and this searches a list defined by *typeAheadSql*. The user selects an element by clicking on it or by using one
+of the *typeAheadTagDelimiter* characters (by default tab or comma). If a tag is selected, it will be visual separated
+from the input cursor. Already selected tags can not be edited but removed (clicking on the x). Further tags can be selected.
 
-The maximum number
+Usage: A user might choose one or more tags from a typeahead list (to minimize typos and to reuse already given tags).
 
-Usage: A user might choose multiple tags from a typeahead list (to minimize typos and to reuse already given tags).
+*typeAhaedTag* support two modes:
 
-Tags might be saved in a string (primary table column as defined in *FormElement.name*
+* Mode *tag*: Default. User selected tags will be given as a comma separated list. Maximum of saved records is limit by
+  the size of the column.
+* Mode *glue*: Activated by set *sqlInsertGlue*. Details see `ta_mode_glue`_
 
 * *FormElement.parameter*:
 
@@ -3580,13 +3584,24 @@ Tags might be saved in a string (primary table column as defined in *FormElement
   * *typeAheadTagDelimiter* = List of ASCII codes to separate tags during input. Default '9,44' (tab and comma).
   * *sqlInsertTag* = {{INSERT INTO tags (name) VALUES (?)}}
   * *sqlInsertGlue* = {{INSERT INTO glue (name) VALUES (?)}}
-  * *slaveId* = Used in glue mode {{!SELECT
 
+* *FromElement.value* = Used in glue mode {{!SELECT
 
-If FormElement.name points to a primary table column, the user selected tags are saved as comma selected list
-If Parameter *sqlInsertGlue* is given, tags are assigned by glue, not by defining them directly in the string.
+.. _'ta_mode_glue':
 
+Mode: Glue
+;;;;;;;;;;
 
+Instead of saving the tag value (mode *tag*), save references (=glue) to the tags.
+
+In *FormElement.value* select all references and the shown values:
+
+  {{!SELECT gl.id AS id, t.value AS value FROM Glue AS gl, Tag as t WHERE gl.recordId={{id:R}} AND gl.idTag=t.id}}
+
+The maximum number of tags is not limited.
+
+If the user removes a tag, the corresponding glue record will be deleted. QFQ detects such records by comparing the initial
+dataset of FormElement.value (looking for missing tags on form save).
 
 
 Type: editor
-- 
GitLab


From 65c7704d3abe8e0d7c9d41fd406c6286fb1ca827 Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Mon, 17 Feb 2020 11:04:42 +0100
Subject: [PATCH 27/48] refs #10117 fix bug where not all tags are shown after
 save

---
 javascript/src/Helper/tagManager.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/javascript/src/Helper/tagManager.js b/javascript/src/Helper/tagManager.js
index 69062116..e4775095 100644
--- a/javascript/src/Helper/tagManager.js
+++ b/javascript/src/Helper/tagManager.js
@@ -18,8 +18,6 @@
 
     "use strict";
 
-    var disableHiddenUpdate = false;
-
     var defaults = {
             prefilled: null,
             CapitalizeFirstLetter: false,
@@ -87,7 +85,7 @@
                 }
 
                 // call the validator (if any) and do not let the tag pass if invalid
-                if (!ignoreValidator && opts.validator && !opts.validator(tag)) {
+                if (!ignoreValidator && opts.validator && !opts.validator(tag) && !opts.disableHiddenUpdate) {
                     $self.trigger('tm:invalid', tag);
                     return;
                 }
@@ -304,8 +302,8 @@
             },
 
             refreshHiddenTagList: function () {
-                if (!disableHiddenUpdate) {
-                    var $self = $(this), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList");
+                var $self = $(this), opts = $self.data('opts'), tlis = $self.data("tlis"), lhiddenTagList = $self.data("lhiddenTagList");
+                if (!opts.disableHiddenUpdate) {
 
                     if (lhiddenTagList) {
                         $(lhiddenTagList).val(tlis.join($self.data('opts').baseDelimiter)).change();
@@ -399,6 +397,7 @@
                 opts.baseDelimiter = String.fromCharCode(opts.delimiterChars[0] || 44);
                 opts.tagBaseClass = 'tm-tag';
                 opts.inputBaseClass = 'tm-input';
+                opts.disableHiddenUpdate = false;
 
                 if (!$.isFunction(opts.validator)) {
                     opts.validator = null;
@@ -536,7 +535,7 @@
         };
 
     $.fn.tagsManager = function (method) {
-        var $self = $(this);
+        var $self = $(this), opts = $self.data('opts');
 
         if (!(0 in this)) {
             return this;
@@ -547,7 +546,7 @@
         } else if (typeof method === 'object' || !method) {
             return privateMethods.init.apply(this, arguments);
         } else if (method === 'disableHiddenUpdate') {
-            disableHiddenUpdate = arguments[1];
+            opts.disableHiddenUpdate = arguments[1];
         } else {
             $.error('Method ' + method + ' does not exist.');
             return false;
-- 
GitLab


From 72d5ef9d89ee06c73fd089b4687cfc5009e94e7a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gr=C3=B6belbauer?=
 <philipp.groebelbauer@math.uzh.ch>
Date: Wed, 19 Feb 2020 09:18:14 +0100
Subject: [PATCH 28/48] added missing 'FROM' in typeAheadSql example

---
 Documentation/Manual.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 53ecce4b..bbab2730 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -3540,7 +3540,7 @@ SQL
 
 * *FormElement.parameter*:
 
-  * *typeAheadSql* = `SELECT ... AS 'id', ... AS 'value' WHERE name LIKE ? OR firstName LIKE ? LIMIT 100`
+  * *typeAheadSql* = `SELECT ... AS 'id', ... AS 'value' FROM ... WHERE name LIKE ? OR firstName LIKE ? LIMIT 100`
 
     * If there is only one column in the SELECT statement, that one will be used and there is no dict (key/value pair).
     * If there is no column `id` or no column `value`, then the first column becomes `id` and the second column becomes `value`.
-- 
GitLab


From 7bf7d51753195d15f9dddefaa5beab9231f66dbf Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 19 Feb 2020 20:54:06 +0100
Subject: [PATCH 29/48] Refs #9517: TypeAhead - Implements insert/delete glue
 records

---
 extension/Classes/Core/AbstractBuildForm.php  |  4 +-
 extension/Classes/Core/Constants.php          |  5 +-
 extension/Classes/Core/Form/FormAction.php    |  5 +-
 extension/Classes/Core/Save.php               | 54 ++++++++++++++++++-
 .../Classes/Core/Store/FillStoreForm.php      |  3 +-
 5 files changed, 64 insertions(+), 7 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 85b63a5c..0d838674 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -736,7 +736,8 @@ abstract class AbstractBuildForm {
         $html = '';
 
         // The following 'FormElement.parameter' will never be used during load (fe.type='upload'). FE_PARAMETER has been already expanded.
-        $skip = [FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER, FE_FILL_STORE_VAR, FE_FILE_DOWNLOAD_BUTTON];
+        $skip = [FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER,
+            FE_FILL_STORE_VAR, FE_FILE_DOWNLOAD_BUTTON, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE, FE_TYPEAHEAD_TAG_INSERT];
 
         // get current data record
         $primaryKey = $this->formSpec[F_PRIMARY_KEY];
@@ -1487,7 +1488,6 @@ abstract class AbstractBuildForm {
         $attribute .= Support::doAttribute('data-load', ($formElement[FE_DYNAMIC_UPDATE] === 'yes') ? 'data-load' : '');
         $attribute .= Support::doAttribute('title', $formElement[FE_TOOLTIP]);
 
-
         $attribute .= HelperFormElement::getAttributeFeMode($formElement[FE_MODE], false);
 
         $attribute .= Support::doAttribute('class', $class);
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index 2aab95f4..19f4e759 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -728,7 +728,8 @@ const VAR_FILENAME_EXT = 'filenameExt'; // Extension of the original filename of
 const VAR_FILE_MIME_TYPE = 'mimeType';
 const VAR_FILE_SIZE = 'fileSize';
 const VAR_ALL_REQUIRED_GIVEN = 'allRequiredGiven'; // If all required FE are given: 1, else: 0. If there is no required FE: 1
-
+const VAR_TAG_ID = 'tagId';
+const VAR_TAG_VALUE = 'tagValue';
 
 // PHP class Typeahead
 const TYPEAHEAD_API_QUERY = 'query';  // Name of parameter in API call of typeahead.php?query=...&s=... - See also FE_TYPE_AHEAD_SQL
@@ -1242,7 +1243,7 @@ const FE_TYPEAHEAD_PEDANTIC = F_TYPEAHEAD_PEDANTIC;
 const FE_TYPEAHEAD_TAG = 'typeAheadTag';
 const FE_TYPEAHEAD_TAG_DELIMITER = 'typeAheadTagDelimiter';
 const FE_TYPEAHEAD_GLUE_INSERT = 'typeAheadGlueInsert';
-const FE_TYPEAHEAD_GLUE_TAG = 'typeAheadGlueTable';
+const FE_TYPEAHEAD_GLUE_DELETE = 'typeAheadGlueDelete';
 const FE_TYPEAHEAD_TAG_INSERT = 'typeAheadTagInsert';
 const FE_TYPEAHEAD_TAG_TABLE = 'typeAheadTagTable';
 
diff --git a/extension/Classes/Core/Form/FormAction.php b/extension/Classes/Core/Form/FormAction.php
index 37c82fc9..a66e5455 100644
--- a/extension/Classes/Core/Form/FormAction.php
+++ b/extension/Classes/Core/Form/FormAction.php
@@ -342,12 +342,15 @@ class FormAction {
     }
 
     /**
+     * Process slaveId, sqlBefore, sqlInsert|sqlUpdate|sqlDelete, sqlAfter.
+     * flagFeAction=false: for Native Elements
+     * flagFeAction=true: for Action Elements
+     *
      * Create the slave record. First try to evaluate a slaveId. Depending if the slaveId > 0 choose `sqlUpdate` or
      * `sqlInsert`
      *
      * @param array $fe
      * @param int $recordId
-     *
      * @param bool $flagFeAction indicates of the FE are of type 'native' or 'action'.
      * @return int  ACTION_ELEMENT_MODIFIED if there are potential(!) changes on the DB like INSERT / UPDATE,
      *              ACTION_ELEMENT_NO_CHANGE if nothing happened
diff --git a/extension/Classes/Core/Save.php b/extension/Classes/Core/Save.php
index 396a02d4..d9bc2108 100644
--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -12,6 +12,7 @@ use IMATHUZH\Qfq\Core\Database\Database;
 use IMATHUZH\Qfq\Core\Form\FormAction;
 use IMATHUZH\Qfq\Core\Helper\HelperFile;
 use IMATHUZH\Qfq\Core\Helper\HelperFormElement;
+use IMATHUZH\Qfq\Core\Helper\KeyValueStringParser;
 use IMATHUZH\Qfq\Core\Helper\Logger;
 use IMATHUZH\Qfq\Core\Helper\OnArray;
 use IMATHUZH\Qfq\Core\Helper\Sanitize;
@@ -288,7 +289,6 @@ class Save {
             }
             $newValues[$column] = $formValues[$column];
             $realColumnFound = true;
-
         }
 
         // Only save record if real columns exist.
@@ -315,6 +315,8 @@ class Save {
     }
 
     /**
+     * Process sqlBefore, sqlInsert|.... for all native FE.
+     *
      * @param $recordId
      *
      * @throws \CodeException
@@ -330,6 +332,56 @@ class Save {
             $this->store->setVar(SYSTEM_FORM_ELEMENT_ID, $fe[FE_ID], STORE_SYSTEM);
 
             $this->formAction->doSqlBeforeSlaveAfter($fe, $recordId, false);
+            $this->typeAheadDoTagGlue($fe);
+        }
+    }
+
+    /**
+     * typeAhead: if given, process Tag or Glue.
+     *
+     * @param array $fe
+     * @throws \CodeException
+     * @throws \DbException
+     * @throws \UserFormException
+     * @throws \UserReportException
+     */
+    private function typeAheadDoTagGlue(array $fe) {
+
+        if (($fe[FE_TYPEAHEAD_TAG] ?? '0') == '0' || (!isset($fe[FE_TYPEAHEAD_GLUE_INSERT]) && !isset($fe[FE_TYPEAHEAD_TAG_INSERT]))) {
+            return;
+        }
+
+        if (empty($fe[FE_TYPEAHEAD_GLUE_INSERT]) || empty($fe[FE_TYPEAHEAD_GLUE_DELETE])) {
+            throw new \UserFormException("Missing 'typeAheadGlueInsert' or 'typeAheadGlueDelete'", ERROR_MISSING_REQUIRED_PARAMETER);
+        }
+
+        // Extract assigned tags: last
+        $tagLast = KeyValueStringParser::parse($this->evaluate->parse($fe[FE_VALUE], ROW_EXPECT_0_1));
+
+        // Extract assigned tags: new
+        $tagNew = KeyValueStringParser::parse($this->store->getVar($fe[FE_NAME], STORE_FORM,
+            ($fe[FE_CHECK_TYPE] == SANITIZE_ALLOW_AUTO) ? SANITIZE_ALLOW_ALNUMX : $fe[FE_CHECK_TYPE]));
+
+        // Get all tags who are new
+        $result = array_diff_assoc($tagNew, $tagLast);
+
+        // Create glue records
+        foreach ($result as $id => $value) {
+            $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
+            $this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR);
+            // Create glue
+            $this->evaluate->parse($fe[FE_TYPEAHEAD_GLUE_INSERT]);
+        }
+
+        // Get all tags who has been removed
+        $result = array_diff_assoc($tagLast, $tagNew);
+
+        // Delete Glue records
+        foreach ($result as $id => $value) {
+            $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
+            $this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR);
+            // Delete glue
+            $this->evaluate->parse($fe[FE_TYPEAHEAD_GLUE_DELETE]);
         }
     }
 
diff --git a/extension/Classes/Core/Store/FillStoreForm.php b/extension/Classes/Core/Store/FillStoreForm.php
index 1de0e536..e14a37d2 100644
--- a/extension/Classes/Core/Store/FillStoreForm.php
+++ b/extension/Classes/Core/Store/FillStoreForm.php
@@ -174,7 +174,8 @@ class FillStoreForm {
     public function process($formMode = FORM_SAVE) {
 
         // The following will never be used during load (fe.type='upload').
-        $skip = [FE_SLAVE_ID, FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER, FE_VALUE, FE_FILL_STORE_VAR];
+        $skip = [FE_SLAVE_ID, FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER,
+            FE_VALUE, FE_FILL_STORE_VAR, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE, FE_TYPEAHEAD_TAG_INSERT];
 
         $html = '';
         $newValues = array();
-- 
GitLab


From d4614f8cd4c6411056118a43e8f229c03730823e Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Wed, 19 Feb 2020 23:48:13 +0100
Subject: [PATCH 30/48] Refs #9517: TypeAhead - Mainly update Manual.rst

---
 Documentation/Manual.rst             | 122 ++++++++++++++++++++++-----
 extension/Classes/Core/Constants.php |   2 -
 extension/Classes/Core/Evaluate.php  |   5 +-
 extension/Classes/Core/Save.php      |  11 +++
 4 files changed, 115 insertions(+), 25 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 72e9e2ae..8361aba3 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -3230,6 +3230,12 @@ See also at specific *FormElement* definitions.
 | typeAheadMinLength,    |        |                                                                                                          |
 | typeAheadSql,          |        |                                                                                                          |
 | typeAheadSqlPrefetch,  |        |                                                                                                          |
+| typeAheadPedantic      |        |                                                                                                          |
++------------------------+--------+----------------------------------------------------------------------------------------------------------+
+| typeAheadTag,          |        | See `type_ahead_tag`_                                                                                    |
+| typeAheadGlueInsert,   |        |                                                                                                          |
+| typeAheadGlueDelete,   |        |                                                                                                          |
+| typeAheadTagInsert     |        |                                                                                                          |
 +------------------------+--------+----------------------------------------------------------------------------------------------------------+
 | wrapRow                | string | If specified, skip default wrapping (`<div class='col-md-?'>`). Instead the given string is used.        |
 +------------------------+--------+                                                                                                          |
@@ -3560,49 +3566,124 @@ LDAP
 
 See :ref:`LDAP_Typeahead`
 
-.. _`input-editor`:
+
+.. _`type_ahead_tag`:
 
 Type Ahead Tag
 """"""""""""""
 
-This extends a TypeAhead input element to take more than one token (=tag) in the same input element. The user starts
-typing and this searches a list defined by *typeAheadSql*. The user selects an element by clicking on it or by using one
-of the *typeAheadTagDelimiter* characters (by default tab or comma). If a tag is selected, it will be visual separated
-from the input cursor. Already selected tags can not be edited but removed (clicking on the x). Further tags can be selected.
+Extend a TypeAhead input element to take more than one token (=tag) in the same input element.
+
+This mode supports only *typeAheadSql* (no LDAP).
 
 Usage: A user might choose one or more tags from a typeahead list (to minimize typos and to reuse already given tags).
 
-*typeAhaedTag* support two modes:
+The user starts typing and for each keypress *typeAheadSql* is searched for all matches. The user selects an element
+by clicking on it or by using one of the *typeAheadTagDelimiter* key presses (by default tab or comma). If a tag is
+selected, it will be visual separated from the input cursor. Already selected tags can not be edited but removed
+(clicking on the x). Further tags can be added.
+
+*typeAheadTag* support two different modes: a) *Tag* , b) *Glue*.
+
+.. _`ta_mode_tag`:
+
+Mode: Tag
+;;;;;;;;;
+
+Tags will be loaded and saved as a comma separated list. Maximum length of saved tags is limit by
+the size of the column (incl. separator).
 
-* Mode *tag*: Default. User selected tags will be given as a comma separated list. Maximum of saved records is limit by
-  the size of the column.
-* Mode *glue*: Activated by set *sqlInsertGlue*. Details see `ta_mode_glue`_
+Additional arguments needed for *typeAheadTag*:
 
 * *FormElement.parameter*:
 
   * *typeAheadTag* = [0|1] - Default 0 (=off), existence or =1 switches the mode *typeAheadTag* on.
   * *typeAheadTagDelimiter* = List of ASCII codes to separate tags during input. Default '9,44' (tab and comma).
-  * *sqlInsertTag* = {{INSERT INTO tags (name) VALUES (?)}}
-  * *sqlInsertGlue* = {{INSERT INTO glue (name) VALUES (?)}}
 
-* *FromElement.value* = Used in glue mode {{!SELECT
-
-.. _'ta_mode_glue':
+.. _`ta_mode_glue`:
 
 Mode: Glue
 ;;;;;;;;;;
 
-Instead of saving the tag value (mode *tag*), save references (=glue) to the tags.
+For each selected tag a glue record, pointing to the tag, is created.
+
+The *Glue* mode will be activated by setting *FormElement.parameter.typeAheadGlueInsert* with a corresponding SQL statement.
+
+Glue records will be created or deleted, as the user select or deselect tags. Processing of those Glue records will be done
+after the primary form record has been written and before any after*-action FormElements will be processed.
+
+*FormElement.name* should **not** point to a column in the form primary table. Instead a free name should be used for the *typeAhead*
+FormElement.
 
-In *FormElement.value* select all references and the shown values:
+The maximum number of tags is not limited - but take care to size the FormElement big enough (*FormElement.maxLength*) to
+show all tags.
+
+On *Form load* (to show already assigned tags) a comma separated list has to be given in *FormElement.value*, based on
+the previously saved Glue records. The string format is identically to the one used in mode *Tag*.
+
+Extra parameter for mode = *Tag* :
+
+* *FormElement.parameter*:
 
-  {{!SELECT gl.id AS id, t.value AS value FROM Glue AS gl, Tag as t WHERE gl.recordId={{id:R}} AND gl.idTag=t.id}}
+  * *typeAheadTagInsert* = {{INSERT INTO Tag (....) VALUES (...)}} - Only needed with *typeAheadPedantic=0*.
+  * *typeAheadGlueInsert* = {{INSERT INTO glueTag (...) VALUES (...)}}
+  * *typeAheadGlueDelete* = {{DELETE FROM glueTag WHERE ...}}
 
-The maximum number of tags is not limited.
+**Example**:
 
-If the user removes a tag, the corresponding glue record will be deleted. QFQ detects such records by comparing the initial
-dataset of FormElement.value (looking for missing tags on form save).
+Table *Person* with some records.
+Table *Fruit* with a list of fruits.
+Table *FruitPerson* with glue records.
 
+Usage: assign favourite fruits to a person. The fruits are the tags, the glue records will assign the fruits to a person.
+
+The form will be open with a person record and has only one FormElement.
+
+ * Form.name=personFavouriteFruits
+ * Form.title=Person Favourite Fruits
+ * Form.primaryTable = Person
+
+ * FormElement[1].name = myFavoriteFruits
+ * FormElement[1].type = Text
+ * FormElement[1].value = {{SELECT GROUP_CONCAT( CONCAT(f.id, ':', f.name) ORDER BY f.name) FROM FruitPerson AS fp, Fruit AS f WHERE fp.pId={{id:R}} AND fp.fruitId=f.id ORDER BY f.name}}
+ * FormElement[1].parameter:
+
+   * typeAheadTag = 1
+   * typeAheadSql = SELECT f.id, f.name AS value FROM Fruit AS f WHERE f.name LIKE ?
+   * typeAheadMinLength = 1
+   * typeAheadGlueInsert = {{INSERT INTO FruitPerson (pId, fruitId) VALUES ({{id:R}}, {{tagId:V}} ) }}
+   * typeAheadGlueDelete = {{DELETE FROM FruitPerson WHERE pId={{id:R}} AND fruitId={{tagId:V}} }}
+
+Explanation:
+
+* On form load, without any assigned tags (=fruits), *FormElement.value* will be empty.
+* The User will assign three fruits: Apple, Banana, Lemon.
+* On form save, QFQ does:
+
+  * compares the old tag assigment (empty) with the new tag assigment (3 elements).
+  * for each new assigned tag:
+
+    * the *tagId* and *tagValue* will be stored in STORE_VAR (that's the one selected by the user and defined
+      via *typeAheadSql*)
+    * *typeAheadGlueInsert* will be fired (with the replaced variable *{{tagId:V}}*).
+
+* The user loads the person favourite fruit form again (same user).
+* *FormElement.value* will now be: ``1:Apple,3:Banana,10:Lemon``.
+* The user removes 'Banana' and adds 'Orange'.
+* On form save, QFQ does:
+
+  * compares the old tag assigment (3 elements) with the new tag assigment (also 3 elements, but different).
+  * for each new assigned tag:
+
+    * the *tagId* and *tagValue* will be stored in STORE_VAR.
+    * *typeAheadGlueInsert* will be fired (with the replaced variable *{{tagId:V}}*).
+
+  * for each removed assigned tag:
+
+    * the *tagId* and *tagValue* will be stored in STORE_VAR.
+    * *typeAheadGlueDelete* will be fired (with the replaced variable *{{tagId:V}}*).
+
+.. _`input-editor`:
 
 Type: editor
 ^^^^^^^^^^^^
@@ -3622,7 +3703,6 @@ Type: editor
   * Top: *toolbar* - by default visible.
   * Bottom: *statusbar* - by default hidden, exception: *min_height* and *max_height* are given via size parameter.
 
-
 * The default setting in *FormElement.parameter* is::
 
     editor-plugins=code link lists searchreplace table textcolor textpattern visualchars
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index 19f4e759..b425bdd3 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -1245,8 +1245,6 @@ const FE_TYPEAHEAD_TAG_DELIMITER = 'typeAheadTagDelimiter';
 const FE_TYPEAHEAD_GLUE_INSERT = 'typeAheadGlueInsert';
 const FE_TYPEAHEAD_GLUE_DELETE = 'typeAheadGlueDelete';
 const FE_TYPEAHEAD_TAG_INSERT = 'typeAheadTagInsert';
-const FE_TYPEAHEAD_TAG_TABLE = 'typeAheadTagTable';
-
 
 const FE_TYPEAHEAD_SQL = 'typeAheadSql';
 const FE_TYPEAHEAD_SQL_PREFETCH = 'typeAheadSqlPrefetch';
diff --git a/extension/Classes/Core/Evaluate.php b/extension/Classes/Core/Evaluate.php
index 3c15548b..55521c57 100644
--- a/extension/Classes/Core/Evaluate.php
+++ b/extension/Classes/Core/Evaluate.php
@@ -135,10 +135,11 @@ class Evaluate {
      * @param string $line
      * @param string $sqlMode ROW_IMPLODE | ROW_REGULAR | ... - might be overwritten in $line by '{{!...'
      * @param int $recursion
-     *
      * @param array $debugStack
      * @param string $foundInStore
-     * @return array|mixed|null|string
+     *
+     * @return array|mixed|null|string - in case of INSERT: last_insert_id()
+     *
      * @throws \CodeException
      * @throws \DbException
      * @throws \UserFormException
diff --git a/extension/Classes/Core/Save.php b/extension/Classes/Core/Save.php
index d9bc2108..9d4b6968 100644
--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -347,6 +347,7 @@ class Save {
      */
     private function typeAheadDoTagGlue(array $fe) {
 
+        // Update 'glue' records?
         if (($fe[FE_TYPEAHEAD_TAG] ?? '0') == '0' || (!isset($fe[FE_TYPEAHEAD_GLUE_INSERT]) && !isset($fe[FE_TYPEAHEAD_TAG_INSERT]))) {
             return;
         }
@@ -369,6 +370,16 @@ class Save {
         foreach ($result as $id => $value) {
             $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
             $this->store->setVar(VAR_TAG_VALUE, $value, STORE_VAR);
+
+            if ($id == 0) {
+                if (empty($fe[FE_TYPEAHEAD_TAG_INSERT])) {
+                    throw new \UserFormException("Missing 'typeAheadTagInsert'", ERROR_MISSING_REQUIRED_PARAMETER);
+                }
+                // Create tag
+                $id = $this->evaluate->parse($fe[FE_TYPEAHEAD_TAG_INSERT]);
+                $this->store->setVar(VAR_TAG_ID, $id, STORE_VAR);
+            }
+
             // Create glue
             $this->evaluate->parse($fe[FE_TYPEAHEAD_GLUE_INSERT]);
         }
-- 
GitLab


From 4ce6ad881c1893272452a8204c7b538dbd7a74b9 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Thu, 20 Feb 2020 18:00:52 +0100
Subject: [PATCH 31/48] Fixes #10152: QCC() - Stored Procedure to escape : and
 ,

---
 extension/Classes/Sql/function.sql | 34 ++++++++++++++++++++++--------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/extension/Classes/Sql/function.sql b/extension/Classes/Sql/function.sql
index 3e6d92ba..48809db9 100644
--- a/extension/Classes/Sql/function.sql
+++ b/extension/Classes/Sql/function.sql
@@ -43,13 +43,29 @@ END;
 #
 DROP FUNCTION IF EXISTS QBAR;
 CREATE FUNCTION QBAR(input TEXT)
-  RETURNS TEXT
-  DETERMINISTIC
-  SQL SECURITY INVOKER
+    RETURNS TEXT
+    DETERMINISTIC
+    SQL SECURITY INVOKER
 BEGIN
-  DECLARE output TEXT;
-  SET output = REPLACE(input, '|', '\\|');
-  RETURN output;
+    DECLARE output TEXT;
+    SET output = REPLACE(input, '|', '\\|');
+    RETURN output;
+END;
+
+###
+#
+# QCC(input)
+# replaces ':' (colon) and ',' (coma)  in `input` with '\:' and '\,'
+#
+DROP FUNCTION IF EXISTS QCC;
+CREATE FUNCTION QCC(input TEXT)
+    RETURNS TEXT
+    DETERMINISTIC
+    SQL SECURITY INVOKER
+BEGIN
+    DECLARE output TEXT;
+    SET output = REPLACE(REPLACE(input, ':', '\\:'), ',', '\\,');
+    RETURN output;
 END;
 
 ###
@@ -59,9 +75,9 @@ END;
 #
 DROP FUNCTION IF EXISTS QNL2BR;
 CREATE FUNCTION QNL2BR(input TEXT)
-  RETURNS TEXT
-  DETERMINISTIC
-  SQL SECURITY INVOKER
+    RETURNS TEXT
+    DETERMINISTIC
+    SQL SECURITY INVOKER
 BEGIN
   DECLARE output TEXT;
   SET output = REPLACE(REPLACE(input, CHAR(13), ''), CHAR(10), '<br>');
-- 
GitLab


From 6a4a04e4939aba7ecc06fdfd0989b7d27b3631a7 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Fri, 21 Feb 2020 17:59:35 +0100
Subject: [PATCH 32/48] Manual.rst: add strip_tags to FormEditor list of forms.

---
 Documentation/Manual.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 8361aba3..b952d78f 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -287,7 +287,7 @@ Setup a *report* to manage all *forms*:
         10 {
             # All forms
             sql = SELECT CONCAT('p:{{pageAlias:T}}&form=form&r=', f.id, '|A:data-reference=editForm', f.name) as _pagee
-                         , f.id, QMORE(f.name, 50), f.title AS '_striptags', f.tableName
+                         , f.id, f.name, QMORE(strip_tags(f.title), 50), f.tableName
                          , CONCAT('U:form=form&r=', f.id, '|A:data-reference=deletForm') as _paged
                       FROM Form AS f
                       ORDER BY f.name
-- 
GitLab


From 952bfb6ec549efa11278410a30863746029cbce0 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Mon, 24 Feb 2020 13:16:05 +0100
Subject: [PATCH 33/48] Refs #9517: TypeAhead - escaping ':' ',' partly
 implemented.

---
 extension/Classes/Core/AbstractBuildForm.php      | 15 +++------------
 extension/Classes/Core/Constants.php              |  3 +++
 .../Classes/Core/Helper/KeyValueStringParser.php  | 10 +++++++++-
 extension/Classes/Core/Store/FillStoreForm.php    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 0d838674..6127c220 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -1363,23 +1363,13 @@ abstract class AbstractBuildForm {
                 $attribute .= Support::doAttribute(DATA_TYPEAHEAD_TAG_DELIMITER, $kk);
                 $formElement[FE_INPUT_TYPE] = 'hidden';
 
-                // TAG handling expects the '$value' as a JSON string.
-                // Old, much to complicated
-                $kk = KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
+                // Client: TAG handling expects the '$value' as a JSON string.
+                $kk = KeyValueStringParser::parse($value, PARAM_KEY_VALUE_DELIMITER, PARAM_LIST_DELIMITER, KVP_IF_VALUE_EMPTY_COPY_KEY);
                 $jj = '';
                 foreach ($kk as $arrKey => $arrValue) {
                     $jj .= ',' . json_encode(["key" => $arrKey, "value" => $arrValue]);
                 }
                 $value = '[' . substr($jj, 1) . ']';
-
-//                $tags = [
-//                    ['value' => "Alabama", 'key' => "AL"],
-//                    ['value' => "Alaska", 'key' => "AK"]
-//                ];
-//                $tagsSafeJson = htmlentities(json_encode($tags), ENT_QUOTES, 'UTF-8');
-//
-//                $tags1=KeyValueStringParser::parse($value, ':', ',', KVP_IF_VALUE_EMPTY_COPY_KEY);
-//                $tags1SafeJson = htmlentities(json_encode($tags1), ENT_QUOTES, 'UTF-8');
             }
         }
 
@@ -1460,6 +1450,7 @@ abstract class AbstractBuildForm {
             }
             $attribute .= HelperFormElement::getAttributeList($formElement, [FE_TYPE, 'size']);
             $attribute .= Support::doAttribute('value', htmlentities($value), false);
+//            $attribute .= Support::doAttribute('value', htmlentities($value, ENT_QUOTES, 'UTF-8'), false);
         }
 
         $attribute .= HelperFormElement::getAttributeList($formElement, [FE_INPUT_AUTOCOMPLETE, 'autofocus', 'placeholder']);
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index b425bdd3..b9f905c4 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -1741,6 +1741,9 @@ const QUESTION_INDEX_FLAG_MODAL = 5;
 const PARAM_DELIMITER = '|';
 const PARAM_TOKEN_DELIMITER = ':';
 
+const PARAM_LIST_DELIMITER = ',';
+const PARAM_KEY_VALUE_DELIMITER = ':';
+
 const TOKEN_URL = 'u';
 const TOKEN_MAIL = 'm';
 const TOKEN_PAGE = 'p';
diff --git a/extension/Classes/Core/Helper/KeyValueStringParser.php b/extension/Classes/Core/Helper/KeyValueStringParser.php
index 0c039a06..86b7626f 100644
--- a/extension/Classes/Core/Helper/KeyValueStringParser.php
+++ b/extension/Classes/Core/Helper/KeyValueStringParser.php
@@ -41,7 +41,8 @@ class KeyValueStringParser {
      *
      * @return string
      */
-    public static function unparse(array $keyValueArray, $keyValueDelimiter = ":", $listDelimiter = ",") {
+    public static function unparse(array $keyValueArray, $keyValueDelimiter = PARAM_KEY_VALUE_DELIMITER, $listDelimiter = PARAM_LIST_DELIMITER, $flagEscape = false) {
+
         array_walk($keyValueArray, function (&$value) {
             if (!is_string($value) || $value === "" || strlen($value) === 1) {
                 return;
@@ -54,6 +55,13 @@ class KeyValueStringParser {
 
         $newKeyValuePairImploded = array();
         foreach ($keyValueArray as $key => $value) {
+            if ($flagEscape) {
+                $key = str_replace($keyValueDelimiter, '\\' . $keyValueDelimiter, $key);
+                $key = str_replace($listDelimiter, '\\' . $listDelimiter, $key);
+
+                $value = str_replace($keyValueDelimiter, '\\' . $keyValueDelimiter, $value);
+                $value = str_replace($listDelimiter, '\\' . $listDelimiter, $value);
+            }
             $newKeyValuePairImploded[] = trim($key) . $keyValueDelimiter . $value;
         }
 
diff --git a/extension/Classes/Core/Store/FillStoreForm.php b/extension/Classes/Core/Store/FillStoreForm.php
index e14a37d2..75c894eb 100644
--- a/extension/Classes/Core/Store/FillStoreForm.php
+++ b/extension/Classes/Core/Store/FillStoreForm.php
@@ -304,7 +304,7 @@ class FillStoreForm {
                             $arrValue = $this->doValue($formElement, $formMode, $row['value']);
                             $arrTmp[$arrKey] = $arrValue;
                         }
-                        $val = KeyValueStringParser::unparse($arrTmp);
+                        $val = KeyValueStringParser::unparse($arrTmp, PARAM_KEY_VALUE_DELIMITER, PARAM_LIST_DELIMITER, true);
 
                     } else {
                         // Single Value
-- 
GitLab


From 98cbacdd7d481d7f2451e1cc60f687888b042057 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philipp=20Gr=C3=B6belbauer?=
 <philipp.groebelbauer@math.uzh.ch>
Date: Mon, 24 Feb 2020 14:39:18 +0100
Subject: [PATCH 34/48] minor corrections for typeAheadTag

---
 Documentation/Manual.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index b952d78f..e9793b27 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -3645,11 +3645,11 @@ The form will be open with a person record and has only one FormElement.
 
  * FormElement[1].name = myFavoriteFruits
  * FormElement[1].type = Text
- * FormElement[1].value = {{SELECT GROUP_CONCAT( CONCAT(f.id, ':', f.name) ORDER BY f.name) FROM FruitPerson AS fp, Fruit AS f WHERE fp.pId={{id:R}} AND fp.fruitId=f.id ORDER BY f.name}}
+ * FormElement[1].value = {{SELECT GROUP_CONCAT( CONCAT(f.id, ':', f.name)) FROM FruitPerson AS fp, Fruit AS f WHERE fp.pId={{id:R}} AND fp.fruitId=f.id ORDER BY f.name}}
  * FormElement[1].parameter:
 
    * typeAheadTag = 1
-   * typeAheadSql = SELECT f.id, f.name AS value FROM Fruit AS f WHERE f.name LIKE ?
+   * typeAheadSql = SELECT f.id AS 'id', f.name AS 'value' FROM Fruit AS f WHERE f.name LIKE ?
    * typeAheadMinLength = 1
    * typeAheadGlueInsert = {{INSERT INTO FruitPerson (pId, fruitId) VALUES ({{id:R}}, {{tagId:V}} ) }}
    * typeAheadGlueDelete = {{DELETE FROM FruitPerson WHERE pId={{id:R}} AND fruitId={{tagId:V}} }}
-- 
GitLab


From f9de05c269db6e9bf1a753a6b32fc5f44aa8501c Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 25 Feb 2020 13:27:59 +0100
Subject: [PATCH 35/48] Fixes #10173: HTML input element now get 'disabled'
 instead of former 'readonly'

---
 extension/Classes/Core/Helper/HelperFormElement.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/extension/Classes/Core/Helper/HelperFormElement.php b/extension/Classes/Core/Helper/HelperFormElement.php
index 1af8535f..f097d775 100644
--- a/extension/Classes/Core/Helper/HelperFormElement.php
+++ b/extension/Classes/Core/Helper/HelperFormElement.php
@@ -716,7 +716,8 @@ EOF;
                 break;
             case FE_MODE_REQUIRED:
             case FE_MODE_READONLY:
-                $attribute .= Support::doAttribute($feMode, $feMode);
+//                $attribute .= Support::doAttribute($feMode, $feMode);
+                $attribute .= Support::doAttribute('disabled', 'disabled');
                 break;
             default:
                 throw new \UserFormException("Unknown mode '$feMode'", ERROR_UNKNOWN_MODE);
-- 
GitLab


From 9d90add51a2eda02da0b0d4e65026d72fd2df24d Mon Sep 17 00:00:00 2001
From: Marc Egger <marc.egger@uzh.ch>
Date: Tue, 25 Feb 2020 14:22:47 +0100
Subject: [PATCH 36/48] Fixes #10173 some more. Mode required was set to
 hidden.

---
 extension/Classes/Core/Helper/HelperFormElement.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/extension/Classes/Core/Helper/HelperFormElement.php b/extension/Classes/Core/Helper/HelperFormElement.php
index f097d775..030ed969 100644
--- a/extension/Classes/Core/Helper/HelperFormElement.php
+++ b/extension/Classes/Core/Helper/HelperFormElement.php
@@ -715,6 +715,8 @@ EOF;
             case FE_MODE_SHOW_REQUIRED:
                 break;
             case FE_MODE_REQUIRED:
+                $attribute .= Support::doAttribute('required', 'required');
+                break;
             case FE_MODE_READONLY:
 //                $attribute .= Support::doAttribute($feMode, $feMode);
                 $attribute .= Support::doAttribute('disabled', 'disabled');
-- 
GitLab


From 1d6abb6fc3ae7fe5df9c01f2fd3725fd0308ba1b Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 25 Feb 2020 20:32:43 +0100
Subject: [PATCH 37/48] Fixes #10177: Fill STORE_RECORD directly after form
 INSERT/UPDATE - '{{id:R}}' is now usable in processing Glue inserts.

---
 extension/Classes/Core/QuickFormQuery.php | 3 ---
 extension/Classes/Core/Save.php           | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php
index c1008fa8..be65b029 100644
--- a/extension/Classes/Core/QuickFormQuery.php
+++ b/extension/Classes/Core/QuickFormQuery.php
@@ -550,9 +550,6 @@ class QuickFormQuery {
 
                 $rc = $save->process();
 
-                // Reload fresh saved record and fill STORE_RECORD with it.
-                $this->store->fillStoreWithRecord($this->formSpec[F_TABLE_NAME], $rc, $this->dbArray[$this->dbIndexData], $this->formSpec[F_PRIMARY_KEY]);
-
                 $save->processAllUploads($rc);
 
                 // Action: After*, Sendmail
diff --git a/extension/Classes/Core/Save.php b/extension/Classes/Core/Save.php
index 9d4b6968..fea100a4 100644
--- a/extension/Classes/Core/Save.php
+++ b/extension/Classes/Core/Save.php
@@ -309,6 +309,9 @@ class Save {
             }
         }
 
+        // Reload fresh saved record and fill STORE_RECORD with it. Do this before nativeDoSlave().
+        $this->store->fillStoreWithRecord($this->formSpec[F_TABLE_NAME], $recordId, $this->db, $this->formSpec[F_PRIMARY_KEY]);
+
         $this->nativeDoSlave($recordId);
 
         return $recordId;
-- 
GitLab


From 6e049ecd5ed6febe8516bb1ae099efd7717656a7 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 25 Feb 2020 23:29:41 +0100
Subject: [PATCH 38/48] Refs #10145: QFQ fills
 data-typeahead-initial-suggestion

---
 Documentation/Manual.rst                      | 14 ++++++--
 extension/Classes/Core/AbstractBuildForm.php  | 20 +++++++----
 extension/Classes/Core/Constants.php          |  4 +--
 extension/Classes/Core/Database/Database.php  | 35 ++++++++++---------
 .../Classes/Core/Helper/HelperFormElement.php |  1 -
 extension/Classes/Core/Helper/OnArray.php     | 23 ++++++++++++
 extension/Classes/Core/Helper/Support.php     |  4 +--
 .../Classes/Core/Store/FillStoreForm.php      |  2 +-
 8 files changed, 71 insertions(+), 32 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index e9793b27..2f787953 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -3227,6 +3227,8 @@ See also at specific *FormElement* definitions.
 |                        |        | (defaults to 00:00:00 if none entered).                                                                  |
 +------------------------+--------+----------------------------------------------------------------------------------------------------------+
 | typeAheadLimit,        | string | See `input-typeahead`_                                                                                   |
+| typeAheadInitial       |        |                                                                                                          |
+| Suggestion,            |        |                                                                                                          |
 | typeAheadMinLength,    |        |                                                                                                          |
 | typeAheadSql,          |        |                                                                                                          |
 | typeAheadSqlPrefetch,  |        |                                                                                                          |
@@ -3540,7 +3542,7 @@ configured).
 Configuration via Form / FormElement
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
-All of the `typeAhead*` (except `typeAheadLdap`) and `ldap*` parameter can be specified either in
+All of the `typeAhead*` (except `typeAheadLdap`, `typeAheadInitialSuggestion`) and `ldap*` parameter can be specified either in
 *Form.parameter* or in *FormElement.parameter*.
 
 SQL
@@ -3548,7 +3550,7 @@ SQL
 
 * *FormElement.parameter*:
 
-  * *typeAheadSql* = `SELECT ... AS 'id', ... AS 'value' FROM ... WHERE name LIKE ? OR firstName LIKE ? LIMIT 100`
+  * *typeAheadSql* = ``SELECT ... AS 'id', ... AS 'value' FROM ... WHERE name LIKE ? OR firstName LIKE ? LIMIT 100``
 
     * If there is only one column in the SELECT statement, that one will be used and there is no dict (key/value pair).
     * If there is no column `id` or no column `value`, then the first column becomes `id` and the second column becomes `value`.
@@ -3556,11 +3558,17 @@ SQL
     * The value, typed by the user, will be replaced on all places where a `?` appears.
     * All `?` will be automatically surrounded by '%'. Therefore wildcard search is implemented: `... LIKE '%<?>%' ...`
 
-  * *typeAheadSqlPrefetch* = `SELECT firstName, ' ', lastName FROM Person WHERE id = ?`
+  * *typeAheadSqlPrefetch* = ``SELECT firstName, ' ', lastName FROM Person WHERE id = ?``
 
     * If the query returns several results, only the first one is returned and displayed.
     * If the query selects multiple columns, the columns are concatenated.
 
+  * *typeAheadInitialSuggestion* = ``{{!SELECT fr.id AS id, fr.name AS value FROM Fruit AS fr}}``
+
+    * Shows suggestions when the input element gets the focus, before the user starts to type anything.
+    * If given, *typeAheadMinLength* will be set to 0.
+    * Limit the number of rows via SQL ``... LIMIT ...`` clause.
+
 LDAP
 ;;;;
 
diff --git a/extension/Classes/Core/AbstractBuildForm.php b/extension/Classes/Core/AbstractBuildForm.php
index 6127c220..060a0aa8 100644
--- a/extension/Classes/Core/AbstractBuildForm.php
+++ b/extension/Classes/Core/AbstractBuildForm.php
@@ -737,7 +737,8 @@ abstract class AbstractBuildForm {
 
         // The following 'FormElement.parameter' will never be used during load (fe.type='upload'). FE_PARAMETER has been already expanded.
         $skip = [FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER,
-            FE_FILL_STORE_VAR, FE_FILE_DOWNLOAD_BUTTON, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE, FE_TYPEAHEAD_TAG_INSERT];
+            FE_FILL_STORE_VAR, FE_FILE_DOWNLOAD_BUTTON, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE,
+            FE_TYPEAHEAD_TAG_INSERT, FE_TYPEAHEAD_INITIAL_SUGGESTION];
 
         // get current data record
         $primaryKey = $this->formSpec[F_PRIMARY_KEY];
@@ -1335,6 +1336,7 @@ abstract class AbstractBuildForm {
             }
         }
 
+        // Check if typeAhead[Tag] needs to build
         if ('' != ($typeAheadUrlParam = $this->typeAheadBuildParam($formElement))) {
 
             if (empty($formElement[FE_INPUT_TYPE])) {
@@ -1345,6 +1347,14 @@ abstract class AbstractBuildForm {
                 $formElement[FE_INPUT_AUTOCOMPLETE] = 'off'; // typeahead behaves better with 'autocomplete'='off'
             }
 
+            // Collect typeAhead initial suggestion
+            if (!empty($formElement[FE_TYPEAHEAD_INITIAL_SUGGESTION])) {
+//                $formElement[FE_TYPEAHEAD_MINLENGTH] = 0; // If a suggestion is defined: minLength becomes automatically 0
+                $arr = $this->evaluate->parse($formElement[FE_TYPEAHEAD_INITIAL_SUGGESTION]);
+                $arr = $this->dbArray[$this->dbIndexData]->makeArrayDict($arr, TYPEAHEAD_SQL_KEY_NAME, API_TYPEAHEAD_VALUE, API_TYPEAHEAD_KEY, API_TYPEAHEAD_VALUE);
+                $attribute .= Support::doAttribute(DATA_TYPEAHEAD_INITIAL_SUGGESTION, json_encode($arr));
+            }
+
             $class .= ' ' . CLASS_TYPEAHEAD;
             $dataSip = $this->sip->queryStringToSip($typeAheadUrlParam, RETURN_SIP);
             $attribute .= Support::doAttribute(DATA_TYPEAHEAD_SIP, $dataSip);
@@ -1364,12 +1374,8 @@ abstract class AbstractBuildForm {
                 $formElement[FE_INPUT_TYPE] = 'hidden';
 
                 // Client: TAG handling expects the '$value' as a JSON string.
-                $kk = KeyValueStringParser::parse($value, PARAM_KEY_VALUE_DELIMITER, PARAM_LIST_DELIMITER, KVP_IF_VALUE_EMPTY_COPY_KEY);
-                $jj = '';
-                foreach ($kk as $arrKey => $arrValue) {
-                    $jj .= ',' . json_encode(["key" => $arrKey, "value" => $arrValue]);
-                }
-                $value = '[' . substr($jj, 1) . ']';
+                $arr = KeyValueStringParser::parse($value, PARAM_KEY_VALUE_DELIMITER, PARAM_LIST_DELIMITER, KVP_IF_VALUE_EMPTY_COPY_KEY);
+                $value = OnArray::arrayToQfqJson($arr);
             }
         }
 
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index b9f905c4..ec8f54f3 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -859,6 +859,7 @@ const DATA_ENABLE_SAVE_BUTTON = 'data-enable-save-button';
 const DATA_TYPEAHEAD_LIMIT = 'data-typeahead-limit';
 const DATA_TYPEAHEAD_MINLENGTH = 'data-typeahead-minlength';
 const DATA_TYPEAHEAD_PEDANTIC = 'data-typeahead-pedantic';
+const DATA_TYPEAHEAD_INITIAL_SUGGESTION = 'data-typeahead-initial-suggestion';
 const DATA_TYPEAHEAD_TAG = 'data-typeahead-tags';
 const DATA_TYPEAHEAD_TAG_DELIMITER = 'data-typeahead-tag-delimiters';
 
@@ -870,8 +871,6 @@ const CLASS_FORM_ELEMENT_EDIT = 'qfq-form-element-edit';
 const CLASS_FORM_ELEMENT_AUTO_GROW = 'qfq-auto-grow';
 const ATTRIBUTE_DATA_MAX_HEIGHT = 'data-max-height';
 
-
-
 // BuildForm
 const SYMBOL_NEW = 'new';
 const SYMBOL_EDIT = 'edit';
@@ -1240,6 +1239,7 @@ const FE_LDAP_USE_BIND_CREDENTIALS = F_LDAP_USE_BIND_CREDENTIALS;
 const FE_TYPEAHEAD_LIMIT = F_TYPEAHEAD_LIMIT;
 const FE_TYPEAHEAD_MINLENGTH = F_TYPEAHEAD_MINLENGTH;
 const FE_TYPEAHEAD_PEDANTIC = F_TYPEAHEAD_PEDANTIC;
+const FE_TYPEAHEAD_INITIAL_SUGGESTION = 'typeAheadInitialSuggestion';
 const FE_TYPEAHEAD_TAG = 'typeAheadTag';
 const FE_TYPEAHEAD_TAG_DELIMITER = 'typeAheadTagDelimiter';
 const FE_TYPEAHEAD_GLUE_INSERT = 'typeAheadGlueInsert';
diff --git a/extension/Classes/Core/Database/Database.php b/extension/Classes/Core/Database/Database.php
index 12e3ff72..07ef4bd8 100644
--- a/extension/Classes/Core/Database/Database.php
+++ b/extension/Classes/Core/Database/Database.php
@@ -8,13 +8,13 @@
 
 namespace IMATHUZH\Qfq\Core\Database;
 
- 
-use IMATHUZH\Qfq\Core\Store\Store;
-use IMATHUZH\Qfq\Core\Helper\Logger;
+
 use IMATHUZH\Qfq\Core\Helper\BindParam;
+use IMATHUZH\Qfq\Core\Helper\HelperFile;
 use IMATHUZH\Qfq\Core\Helper\HelperFormElement;
+use IMATHUZH\Qfq\Core\Helper\Logger;
 use IMATHUZH\Qfq\Core\Helper\OnArray;
-use IMATHUZH\Qfq\Core\Helper\HelperFile;
+use IMATHUZH\Qfq\Core\Store\Store;
 
 /**
  * Class Database
@@ -932,10 +932,12 @@ class Database {
     }
 
     /**
-     * $arr will be converted to a two column array with keys $keyName1 and $keyName2.
-     * $arr might contain one or more columns.
-     * Only when $keyName1 and $keyName2 exist, those will be used. Else the first column becomes $keyName1 and the
-     * second becomes $keyName2. If there is only one column, that column will be doubled.
+     * $arr = [ 0 => [ $srcColumn1 => $value0_1, $srcColumn2 => $value0_2 ], 1 => [ $srcColumn1 => $value1_1, $srcColumn2 => $value1_2 ], ...]
+     *
+     * $arr will be converted to a two column array with keys $destColumn1 and $destColumn2.
+     * If $destColumn1 or $destColumn2 is empty, take $srcColumn1, $srcColumn2 as names.
+     * $arr might contain one or more columns. Only the first two columns are used.
+     * If there is only one column, that column will be doubled.
      *
      * @param array $arr
      * @param string $srcColumn1
@@ -947,6 +949,11 @@ class Database {
      */
     public function makeArrayDict(array $arr, $srcColumn1, $srcColumn2, $destColumn1 = '', $destColumn2 = '') {
 
+        if ($arr == array() || $arr === null) {
+            return array();
+        }
+
+        // Set defaults
         if ($destColumn1 == '') {
             $destColumn1 = $srcColumn1;
         }
@@ -955,12 +962,7 @@ class Database {
             $destColumn2 = $srcColumn2;
         }
 
-        $new = array();
-
-        if ($arr == array() || $arr === null) {
-            return array();
-        }
-
+        // Set final column names
         $row = $arr[0];
         $keys = array_keys($row);
         if (count($row) < 2) {
@@ -974,9 +976,11 @@ class Database {
             $column2 = $keys[1];
         }
 
+        $new = array();
         $row = array_shift($arr);
         while (null !== $row) {
             $new[] = [$destColumn1 => $row[$column1], $destColumn2 => $row[$column2]];
+//            $new[] = [$destColumn1 => htmlentities($row[$column1], ENT_QUOTES), $destColumn2 => htmlentities($row[$column2], ENT_QUOTES)];
             $row = array_shift($arr);
         }
 
@@ -1028,8 +1032,7 @@ class Database {
 
         try {
             $this->playMultiQuery($query);
-        }
-        catch (\CodeException $e) {
+        } catch (\CodeException $e) {
             throw new \CodeException("Error playing $filename", ERROR_PLAY_SQL_FILE);
         }
 
diff --git a/extension/Classes/Core/Helper/HelperFormElement.php b/extension/Classes/Core/Helper/HelperFormElement.php
index 030ed969..33c8dcd1 100644
--- a/extension/Classes/Core/Helper/HelperFormElement.php
+++ b/extension/Classes/Core/Helper/HelperFormElement.php
@@ -718,7 +718,6 @@ EOF;
                 $attribute .= Support::doAttribute('required', 'required');
                 break;
             case FE_MODE_READONLY:
-//                $attribute .= Support::doAttribute($feMode, $feMode);
                 $attribute .= Support::doAttribute('disabled', 'disabled');
                 break;
             default:
diff --git a/extension/Classes/Core/Helper/OnArray.php b/extension/Classes/Core/Helper/OnArray.php
index 17a8d535..7e9be89d 100644
--- a/extension/Classes/Core/Helper/OnArray.php
+++ b/extension/Classes/Core/Helper/OnArray.php
@@ -427,4 +427,27 @@ class OnArray {
     public static function getMd5(array $data) {
         return md5(implode($data));
     }
+
+    /**
+     * Converts a one dimensional array to JSON array. The 'key' and 'value' will names are hardcoded:
+     *
+     * Return: [ { 'key': $key[0], 'value': $value[0] }, { 'key': $key[1], 'value': $value[2] }, ... ]
+     *
+     * @param array $arr
+     * @param bool $flagHtmlEntity true|false
+     * @return string
+     */
+    public static function arrayToQfqJson(array $arr, $flagHtmlEntity = false) {
+
+        $json = '';
+        foreach ($arr as $arrKey => $arrValue) {
+            if ($flagHtmlEntity) {
+                $arrKey = htmlentities($arrKey, ENT_QUOTES);
+                $arrValue = htmlentities($arrValue, ENT_QUOTES);
+            }
+            $json .= ',' . json_encode(["key" => $arrKey, "value" => $arrValue]);
+        }
+
+        return '[' . substr($json, 1) . ']';
+    }
 }
\ No newline at end of file
diff --git a/extension/Classes/Core/Helper/Support.php b/extension/Classes/Core/Helper/Support.php
index 33f22db3..915642a7 100644
--- a/extension/Classes/Core/Helper/Support.php
+++ b/extension/Classes/Core/Helper/Support.php
@@ -292,8 +292,8 @@ class Support {
      *
      * TinyMCE: Encoding JS Attributes (keys & values) for TinyMCE needs to be encapsulated in '&quot;' instead of '\"'.
      *
-     * @param        $str
-     * @param string $modeEscape
+     * @param string $str
+     * @param string $modeEscape ESCAPE_WITH_BACKSLASH | ESCAPE_WITH_HTML_QUOTE
      *
      * @return string
      * @throws \CodeException
diff --git a/extension/Classes/Core/Store/FillStoreForm.php b/extension/Classes/Core/Store/FillStoreForm.php
index 75c894eb..14472669 100644
--- a/extension/Classes/Core/Store/FillStoreForm.php
+++ b/extension/Classes/Core/Store/FillStoreForm.php
@@ -175,7 +175,7 @@ class FillStoreForm {
 
         // The following will never be used during load (fe.type='upload').
         $skip = [FE_SLAVE_ID, FE_SQL_UPDATE, FE_SQL_INSERT, FE_SQL_DELETE, FE_SQL_AFTER, FE_SQL_BEFORE, FE_PARAMETER,
-            FE_VALUE, FE_FILL_STORE_VAR, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE, FE_TYPEAHEAD_TAG_INSERT];
+            FE_VALUE, FE_FILL_STORE_VAR, FE_TYPEAHEAD_GLUE_INSERT, FE_TYPEAHEAD_GLUE_DELETE, FE_TYPEAHEAD_TAG_INSERT, FE_TYPEAHEAD_INITIAL_SUGGESTION];
 
         $html = '';
         $newValues = array();
-- 
GitLab


From 589eb99f66aa4a53b465e321826dba1fd29ed5b9 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Tue, 25 Feb 2020 23:56:01 +0100
Subject: [PATCH 39/48] Add QCC() description.

---
 Documentation/Manual.rst | 296 ++++++++++++++++++++-------------------
 1 file changed, 152 insertions(+), 144 deletions(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index 2f787953..b9e14321 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -1,4 +1,5 @@
 .. ==================================================
+.. ==================================================
 .. Header hierarchy
 .. ==
 ..  --
@@ -3120,148 +3121,147 @@ Attributes defined in the parameter field
 
 See also at specific *FormElement* definitions.
 
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| Name                   | Type   | Note                                                                                                     |
-+========================+========+==========================================================================================================+
-| acceptZeroAsRequired   | string | 0|1 - Accept a '0' as a valid input. Default '0' (=0 is not a valid input)                               |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| autofocus              | string | See `input-option-autofocus`_                                                                            |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| capture,               | string | See `input-upload`_                                                                                      |
-| accept,                |        |                                                                                                          |
-| maxFileSize,           |        |                                                                                                          |
-| fileDestination,       |        |                                                                                                          |
-| fileTrash,             |        |                                                                                                          |
-| fileTrashText,         |        |                                                                                                          |
-| fileReplace,           |        |                                                                                                          |
-| autoOrient,            |        |                                                                                                          |
-| autoOrientCmd,         |        |                                                                                                          |
-| autoOrientMimeType,    |        |                                                                                                          |
-| chmodFile, chmodDir,   |        |                                                                                                          |
-| slaveId,               |        |                                                                                                          |
-| sqlBefore,             |        |                                                                                                          |
-| sqlInsert,             |        |                                                                                                          |
-| sqlUpdate,             |        |                                                                                                          |
-| sqlDelete,             |        |                                                                                                          |
-| sqlAfter,              |        |                                                                                                          |
-| importToTable,         |        |                                                                                                          |
-| importToColumns,       |        |                                                                                                          |
-| importRegion,          |        |                                                                                                          |
-| importMode,            |        |                                                                                                          |
-| importType,            |        |                                                                                                          |
-| importNamedSheetsOnly, |        |                                                                                                          |
-| importSetReadDataOnly, |        |                                                                                                          |
-| importListSheetNames,  |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| checkBoxMode           | string | See `input-checkbox`_, `input-radio`_, `input-select`_                                                   |
-| checked                |        |                                                                                                          |
-| unchecked              |        |                                                                                                          |
-| label2                 |        |                                                                                                          |
-| itemList               |        |                                                                                                          |
-| emptyHide              |        |                                                                                                          |
-| emptyItemAtStart       |        |                                                                                                          |
-| emptyItemAtEnd         |        |                                                                                                          |
-| buttonClass            |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| dateFormat             | string | yyyy-mm-dd / dd.mm.yyyy                                                                                  |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| data-pattern-error     | string | Pattern violation: Text for error message                                                                |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| data-required-error    | string | Required violation: Text for error message                                                               |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| data-match-error       | string | Match violation: Text for error message                                                                  |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| data-error             | string | Violation of 'check-type': Text for error message                                                        |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| decimalFormat          | string | [precision,scale] Limits and formats input to a decimal number with the specified precision and scale.   |
-|                        |        | If no precision and scale are specified, the decimal format is pulled from the table definition.         |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| htmlAfter              | string | HTML Code wrapped after the complete *FormElement*                                                       |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| htmlBefore             | string | HTML Code wrapped before the complete *FormElement*                                                      |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| extraButtonLock        | none   | [0|1] Show a 'lock' on the right side of the input element. See `extraButtonLock`_                       |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| extraButtonPassword    | none   | [0|1] Show an 'eye' on the right side of the input element. See `extraButtonPassword`_                   |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| extraButtonInfo        | string | Text. Show an 'i' on the right side of the input element. See `extraButtonInfo`_                         |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| extraButtonInfoClass   | string | By default empty. Specify any class to be assigned to wrap extraButtonInfo                               |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| extraButtonInfoMinWidth| string | See `extraButtonInfo`_                                                                                   |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| editor-plugins,        | string | See `input-editor`_                                                                                      |
-| editor-toolbar,        |        |                                                                                                          |
-| editor-statusbar,      |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| fileButtonText         | string | Overwrite default 'Choose File'                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| fillStoreVar           | string | Fill the STORE_VAR with custom values. See `STORE_VARS`_.                                                |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| form,                  | string | See `subrecord-option`_                                                                                  |
-| page,                  |        |                                                                                                          |
-| title,                 |        |                                                                                                          |
-| extraDeleteForm,       |        |                                                                                                          |
-| detail,                |        |                                                                                                          |
-| subrecordTableClass,   |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| min                    | s/d/n  | Minimum and/or maximum allowed values for input field. Can be used for numbers, dates, or strings.       |
-+------------------------+--------+                                                                                                          |
-| max                    | s/d/n  | *Always use the international format 'yyyy-mm-dd[ hh:mm[:ss]]*                                           |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| processReadOnly        | string | [0|1] By default FE's with type='readonly' are not processed during 'save'.                              |
-|                        |        | This option forces to process them during 'save' as well.                                                |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| retype,                | string | See `input-text`_                                                                                        |
-| retypeLabel,           |        |                                                                                                          |
-| retypeNote,            |        |                                                                                                          |
-| characterCountWrap,    |        |                                                                                                          |
-| hideZero,              |        |                                                                                                          |
-| emptyMeansNull,        |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| showSeconds            | string | 0|1 - Shows the seconds on form load. Default: 0                                                         |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| showZero               | string | 0|1 - Empty timestamp: '0'(default) - nothing shown, '1' - the string '0000-00-00 00:00:00' is displayed |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| timeIsOptional         | string | 0|1 - Used for datetime input. 0 (default): Time is required - 1: Entering a time is optional            |
-|                        |        | (defaults to 00:00:00 if none entered).                                                                  |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| typeAheadLimit,        | string | See `input-typeahead`_                                                                                   |
-| typeAheadInitial       |        |                                                                                                          |
-| Suggestion,            |        |                                                                                                          |
-| typeAheadMinLength,    |        |                                                                                                          |
-| typeAheadSql,          |        |                                                                                                          |
-| typeAheadSqlPrefetch,  |        |                                                                                                          |
-| typeAheadPedantic      |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| typeAheadTag,          |        | See `type_ahead_tag`_                                                                                    |
-| typeAheadGlueInsert,   |        |                                                                                                          |
-| typeAheadGlueDelete,   |        |                                                                                                          |
-| typeAheadTagInsert     |        |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| wrapRow                | string | If specified, skip default wrapping (`<div class='col-md-?'>`). Instead the given string is used.        |
-+------------------------+--------+                                                                                                          |
-| wrapLabel              | string |                                                                                                          |
-+------------------------+--------+                                                                                                          |
-| wrapInput              | string |                                                                                                          |
-+------------------------+--------+                                                                                                          |
-| wrapNote               | string |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| trim                   | string | By default, whitespace is trimmed. To disable, use 'trim=none'. You can also specify custom trim         |
-|                        |        | characters: 'trim=\\ ' only trims spaces.                                                                |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| sqlValidate            | string | See `sqlValidate`_                                                                                       |
-+------------------------+--------+                                                                                                          |
-| expectRecords          | int    |                                                                                                          |
-+------------------------+--------+                                                                                                          |
-| messageFail            | string |                                                                                                          |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| dataReference          | string | Optional. See `applicationTest`_                                                                         |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| requiredPosition       | int    | See `requiredPosition`_.                                                                                 |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
-| minWidth               | int    | See `checkboxRadioMinWidth`_.                                                                            |
-+------------------------+--------+----------------------------------------------------------------------------------------------------------+
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| Name                            | Note                                                                                                     |
++=================================+==========================================================================================================+
+| acceptZeroAsRequired            | 0|1 - Accept a '0' as a valid input. Default '0' (=0 is not a valid input)                               |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| autofocus                       | See `input-option-autofocus`_                                                                            |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| capture,                        | See `input-upload`_                                                                                      |
+| accept,                         |                                                                                                          |
+| maxFileSize,                    |                                                                                                          |
+| fileDestination,                |                                                                                                          |
+| fileTrash,                      |                                                                                                          |
+| fileTrashText,                  |                                                                                                          |
+| fileReplace,                    |                                                                                                          |
+| autoOrient,                     |                                                                                                          |
+| autoOrientCmd,                  |                                                                                                          |
+| autoOrientMimeType,             |                                                                                                          |
+| chmodFile, chmodDir,            |                                                                                                          |
+| slaveId,                        |                                                                                                          |
+| sqlBefore,                      |                                                                                                          |
+| sqlInsert,                      |                                                                                                          |
+| sqlUpdate,                      |                                                                                                          |
+| sqlDelete,                      |                                                                                                          |
+| sqlAfter,                       |                                                                                                          |
+| importToTable,                  |                                                                                                          |
+| importToColumns,                |                                                                                                          |
+| importRegion,                   |                                                                                                          |
+| importMode,                     |                                                                                                          |
+| importType,                     |                                                                                                          |
+| importNamedSheetsOnly,          |                                                                                                          |
+| importSetReadDataOnly,          |                                                                                                          |
+| importListSheetNames,           |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| checkBoxMode                    | See `input-checkbox`_, `input-radio`_, `input-select`_                                                   |
+| checked                         |                                                                                                          |
+| unchecked                       |                                                                                                          |
+| label2                          |                                                                                                          |
+| itemList                        |                                                                                                          |
+| emptyHide                       |                                                                                                          |
+| emptyItemAtStart                |                                                                                                          |
+| emptyItemAtEnd                  |                                                                                                          |
+| buttonClass                     |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| dateFormat                      | yyyy-mm-dd / dd.mm.yyyy                                                                                  |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| data-pattern-error              | Pattern violation: Text for error message                                                                |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| data-required-error             | Required violation: Text for error message                                                               |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| data-match-error                | Match violation: Text for error message                                                                  |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| data-error                      | Violation of 'check-type': Text for error message                                                        |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| decimalFormat                   | [precision,scale] Limits and formats input to a decimal number with the specified precision and scale.   |
+|                                 | If no precision and scale are specified, the decimal format is pulled from the table definition.         |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| htmlAfter                       | HTML Code wrapped after the complete *FormElement*                                                       |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| htmlBefore                      | HTML Code wrapped before the complete *FormElement*                                                      |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| extraButtonLock                 | [0|1] Show a 'lock' on the right side of the input element. See `extraButtonLock`_                       |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| extraButtonPassword             | [0|1] Show an 'eye' on the right side of the input element. See `extraButtonPassword`_                   |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| extraButtonInfo                 | Text. Show an 'i' on the right side of the input element. See `extraButtonInfo`_                         |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| extraButtonInfoClass            | By default empty. Specify any class to be assigned to wrap extraButtonInfo                               |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| extraButtonInfoMinWidth         | See `extraButtonInfo`_                                                                                   |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| editor-plugins,                 | See `input-editor`_                                                                                      |
+| editor-toolbar,                 |                                                                                                          |
+| editor-statusbar,               |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| fileButtonText                  | Overwrite default 'Choose File'                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| fillStoreVar                    | Fill the STORE_VAR with custom values. See `STORE_VARS`_.                                                |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| form,                           | See `subrecord-option`_                                                                                  |
+| page,                           |                                                                                                          |
+| title,                          |                                                                                                          |
+| extraDeleteForm,                |                                                                                                          |
+| detail,                         |                                                                                                          |
+| subrecordTableClass,            |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| min                      s/d/n  | Minimum and/or maximum allowed values for input field. Can be used for numbers, dates, or strings.       |
++---------------------------------+                                                                                                          |
+| max                      s/d/n  | *Always use the international format 'yyyy-mm-dd[ hh:mm[:ss]]*                                           |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| processReadOnly                 | [0|1] By default FE's with type='readonly' are not processed during 'save'.                              |
+|                                 | This option forces to process them during 'save' as well.                                                |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| retype,                         | See `input-text`_                                                                                        |
+| retypeLabel,                    |                                                                                                          |
+| retypeNote,                     |                                                                                                          |
+| characterCountWrap,             |                                                                                                          |
+| hideZero,                       |                                                                                                          |
+| emptyMeansNull,                 |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| showSeconds                     | 0|1 - Shows the seconds on form load. Default: 0                                                         |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| showZero                        | 0|1 - Empty timestamp: '0'(default) - nothing shown, '1' - the string '0000-00-00 00:00:00' is displayed |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| timeIsOptional                  | 0|1 - Used for datetime input. 0 (default): Time is required - 1: Entering a time is optional            |
+|                                 | (defaults to 00:00:00 if none entered).                                                                  |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| typeAheadLimit,                 | See `input-typeahead`_                                                                                   |
+| typeAheadInitialSuggestion,     |                                                                                                          |
+| typeAheadMinLength,             |                                                                                                          |
+| typeAheadSql,                   |                                                                                                          |
+| typeAheadSqlPrefetch,           |                                                                                                          |
+| typeAheadPedantic               |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| typeAheadTag,                   | See `type_ahead_tag`_                                                                                    |
+| typeAheadGlueInsert,            |                                                                                                          |
+| typeAheadGlueDelete,            |                                                                                                          |
+| typeAheadTagInsert              |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| wrapRow                         | If specified, skip default wrapping (`<div class='col-md-?'>`). Instead the given string is used.        |
++---------------------------------+                                                                                                          |
+| wrapLabel                       |                                                                                                          |
++---------------------------------+                                                                                                          |
+| wrapInput                       |                                                                                                          |
++---------------------------------+                                                                                                          |
+| wrapNote                        |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| trim                            | By default, whitespace is trimmed. To disable, use 'trim=none'. You can also specify custom trim         |
+|                                 | characters: 'trim=\\ ' only trims spaces.                                                                |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| sqlValidate                     | See `sqlValidate`_                                                                                       |
++---------------------------------+                                                                                                          |
+| expectRecords                   |                                                                                                          |
++---------------------------------+                                                                                                          |
+| messageFail                     |                                                                                                          |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| dataReference                   | Optional. See `applicationTest`_                                                                         |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| requiredPosition                | See `requiredPosition`_.                                                                                 |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
+| minWidth                        | See `checkboxRadioMinWidth`_.                                                                            |
++---------------------------------+----------------------------------------------------------------------------------------------------------+
 
 
  * `s/d/n`: string or date or number.
@@ -6300,7 +6300,8 @@ Column: _link
 * Most URLs will be rendered via class link.
 * Column names like `_pagee`, `_mailto`, ... are wrapper to class link.
 * The parameters for link contains a prefix to make them position-independent.
-* Parameter have to be separated with '|'. If '|' is part of the value, it needs to be escaped '\\|'. This can be done via QFQ SQL function `QBAR()` - see `qbar-qscape-qfq-delimiter`_.
+* Parameter have to be separated with '|'. If '|' is part of the value, it needs to be escaped '\\|'. This can be done
+  via QFQ SQL function `QBAR()` - see `qbar-escape-qfq-delimiter`_.
 
 +---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
 |URL|IMG|Meaning       |Qualifier                          |Example                    |Description                                                                                                                             |
@@ -7197,7 +7198,7 @@ Example::
 Special SQL Functions (prepared statements)
 -------------------------------------------
 
-.. _qbar-qscape-qfq-delimiter:
+.. _qbar-escape-qfq-delimiter:
 
 QBAR: Escape QFQ Delimiter
 ^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -7212,6 +7213,13 @@ Example::
 In case 'Note.title' contains a '|' (like 'fruit | numbers'), it will confuse the '... AS _link' class. Therefore it's
 necessary to 'escape' (adding a '\' in front of the problematic character) the bar which is done by using `QBAR()`.
 
+.. _qbar-escape-qfq-colon-coma:
+
+QCC: Escape colon / coma
+^^^^^^^^^^^^^^^^^^^^^^^^
+
+The SQL function QCC(text) replaces ":" with "\\:" and "," with "\\," in `text` to prevent conflicts with the QFQ notation.
+
 .. _qnl2br:
 
 QNL2BR: Convert newline to HTML '<br>'
-- 
GitLab


From 95fbe635b7913fb65e12ef779e22969d91d8eb92 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 29 Feb 2020 11:20:15 +0100
Subject: [PATCH 40/48] Fixed #10199 / Form.forwardMode: missing mode 'Close' /
 'Auto' - update formEditor.sql

---
 extension/Classes/Sql/formEditor.sql | 719 ++++++++++++++-------------
 1 file changed, 364 insertions(+), 355 deletions(-)

diff --git a/extension/Classes/Sql/formEditor.sql b/extension/Classes/Sql/formEditor.sql
index 6b3809d2..c1d61e9d 100644
--- a/extension/Classes/Sql/formEditor.sql
+++ b/extension/Classes/Sql/formEditor.sql
@@ -4,151 +4,152 @@ SET sql_mode = "NO_ENGINE_SUBSTITUTION";
 
 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',
-  `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,
-  `multiDetailForm`          VARCHAR(255)                                               NOT NULL DEFAULT '',
-  `multiDetailFormParameter` VARCHAR(255)                                               NOT NULL DEFAULT '',
-
-  `forwardMode`              ENUM ('client', 'no', 'url', 'url-skip-history', 'url-sip',
-                                   'url-sip-skip-history')                              NOT NULL DEFAULT 'client',
-  `forwardPage`              VARCHAR(511)                                               NOT NULL DEFAULT '',
-
-  `labelAlign`               ENUM ('default', 'left', 'center', 'right')                NOT NULL DEFAULT 'default',
-  `bsLabelColumns`           VARCHAR(255)       NOT NULL DEFAULT '',
-  `bsInputColumns`           VARCHAR(255)       NOT NULL DEFAULT '',
-  `bsNoteColumns`            VARCHAR(255)       NOT NULL DEFAULT '',
-
-  `parameter`                TEXT               NOT NULL,
-  `parameterLanguageA`       TEXT               NOT NULL,
-  `parameterLanguageB`       TEXT               NOT NULL,
-  `parameterLanguageC`       TEXT               NOT NULL,
-  `parameterLanguageD`       TEXT               NOT NULL,
-  `recordLockTimeoutSeconds` INT(11)            NOT NULL DEFAULT 900,
-
-  `deleted`                  ENUM ('yes', 'no') NOT NULL DEFAULT 'no',
-  `modified`                 DATETIME           NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`                  DATETIME           NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`),
-  KEY `name` (`name`),
-  KEY `name_deleted` (`name`, `deleted`)
+    `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',
+    `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,
+    `multiDetailForm`          VARCHAR(255)                                                                               NOT NULL DEFAULT '',
+    `multiDetailFormParameter` VARCHAR(255)                                                                               NOT NULL DEFAULT '',
+
+    `forwardMode`              ENUM ('auto', 'close', 'no', 'url', 'url-skip-history', 'url-sip', 'url-sip-skip-history') NOT NULL DEFAULT 'client',
+
+
+    `forwardPage`              VARCHAR(511)                                                                               NOT NULL DEFAULT '',
+
+    `labelAlign`               ENUM ('default', 'left', 'center', 'right')                                                NOT NULL DEFAULT 'default',
+    `bsLabelColumns`           VARCHAR(255)                                                                               NOT NULL DEFAULT '',
+    `bsInputColumns`           VARCHAR(255)                                                                               NOT NULL DEFAULT '',
+    `bsNoteColumns`            VARCHAR(255)                                                                               NOT NULL DEFAULT '',
+
+    `parameter`                TEXT                                                                                       NOT NULL,
+    `parameterLanguageA`       TEXT                                                                                       NOT NULL,
+    `parameterLanguageB`       TEXT                                                                                       NOT NULL,
+    `parameterLanguageC`       TEXT                                                                                       NOT NULL,
+    `parameterLanguageD`       TEXT                                                                                       NOT NULL,
+    `recordLockTimeoutSeconds` INT(11)                                                                                    NOT NULL DEFAULT 900,
+
+    `deleted`                  ENUM ('yes', 'no')                                                                         NOT NULL DEFAULT 'no',
+    `modified`                 DATETIME                                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`                  DATETIME                                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`),
+    KEY `name` (`name`),
+    KEY `name_deleted` (`name`, `deleted`)
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 1000;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 1000;
 
 
 CREATE TABLE IF NOT EXISTS `FormElement`
 (
-  `id`                 INT(11)                                                                    NOT NULL AUTO_INCREMENT,
-  `formId`             INT(11)                                                                    NOT NULL,
-  `feIdContainer`      INT(11)                                                                    NOT NULL DEFAULT '0',
-  `dynamicUpdate`      ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'no',
-
-  `enabled`            ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'yes',
-
-  `name`               VARCHAR(255)                                                               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',
-  `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',
-  `checkType`          ENUM ('auto', 'alnumx', 'digit', 'numerical', 'email', 'pattern', 'allbut',
-                             'all')                                                               NOT NULL DEFAULT 'auto',
-  `checkPattern`       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',
-
-  `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 '',
-  `bsInputColumns`     VARCHAR(255)                                                               NOT NULL DEFAULT '',
-  `bsNoteColumns`      VARCHAR(255)                                                               NOT NULL DEFAULT '',
-  `rowLabelInputNote`  SET ('row', 'label', '/label', 'input', '/input', 'note', '/note', '/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row',
-  `note`               TEXT                                                                       NOT NULL,
-  `adminNote`          TEXT                                                                       NOT NULL,
-  `tooltip`            VARCHAR(255)                                                               NOT NULL DEFAULT '',
-  `placeholder`        VARCHAR(2048)                                                              NOT NULL DEFAULT '',
-
-  `value`              TEXT                                                                       NOT NULL,
-  `sql1`               TEXT                                                                       NOT NULL,
-  `parameter`          TEXT                                                                       NOT NULL,
-  `parameterLanguageA` TEXT                                                                       NOT NULL,
-  `parameterLanguageB` TEXT                                                                       NOT NULL,
-  `parameterLanguageC` TEXT                                                                       NOT NULL,
-  `parameterLanguageD` TEXT                                                                       NOT NULL,
-  `clientJs`           TEXT                                                                       NOT NULL,
-
-  `feGroup`            VARCHAR(255)                                                               NOT NULL DEFAULT '',
-  `deleted`            ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'no',
-  `modified`           DATETIME                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`            DATETIME                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`),
-  KEY `formId` (`formId`),
-  KEY `formId_class_enabled_deleted` (`formId`, `class`, `enabled`, `deleted`),
-  KEY `feIdContainer` (`feIdContainer`),
-  KEY `ord` (`ord`),
-  KEY `feGroup` (`feGroup`)
+    `id`                 INT(11)                                                                    NOT NULL AUTO_INCREMENT,
+    `formId`             INT(11)                                                                    NOT NULL,
+    `feIdContainer`      INT(11)                                                                    NOT NULL DEFAULT '0',
+    `dynamicUpdate`      ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'no',
+
+    `enabled`            ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'yes',
+
+    `name`               VARCHAR(255)                                                               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',
+    `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',
+    `checkType`          ENUM ('auto', 'alnumx', 'digit', 'numerical', 'email', 'pattern', 'allbut',
+        'all')                                                                                      NOT NULL DEFAULT 'auto',
+    `checkPattern`       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',
+
+    `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 '',
+    `bsInputColumns`     VARCHAR(255)                                                               NOT NULL DEFAULT '',
+    `bsNoteColumns`      VARCHAR(255)                                                               NOT NULL DEFAULT '',
+    `rowLabelInputNote`  SET ('row', 'label', '/label', 'input', '/input', 'note', '/note', '/row') NOT NULL DEFAULT 'row,label,/label,input,/input,note,/note,/row',
+    `note`               TEXT                                                                       NOT NULL,
+    `adminNote`          TEXT                                                                       NOT NULL,
+    `tooltip`            VARCHAR(255)                                                               NOT NULL DEFAULT '',
+    `placeholder`        VARCHAR(2048)                                                              NOT NULL DEFAULT '',
+
+    `value`              TEXT                                                                       NOT NULL,
+    `sql1`               TEXT                                                                       NOT NULL,
+    `parameter`          TEXT                                                                       NOT NULL,
+    `parameterLanguageA` TEXT                                                                       NOT NULL,
+    `parameterLanguageB` TEXT                                                                       NOT NULL,
+    `parameterLanguageC` TEXT                                                                       NOT NULL,
+    `parameterLanguageD` TEXT                                                                       NOT NULL,
+    `clientJs`           TEXT                                                                       NOT NULL,
+
+    `feGroup`            VARCHAR(255)                                                               NOT NULL DEFAULT '',
+    `deleted`            ENUM ('yes', 'no')                                                         NOT NULL DEFAULT 'no',
+    `modified`           DATETIME                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`            DATETIME                                                                   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`),
+    KEY `formId` (`formId`),
+    KEY `formId_class_enabled_deleted` (`formId`, `class`, `enabled`, `deleted`),
+    KEY `feIdContainer` (`feIdContainer`),
+    KEY `ord` (`ord`),
+    KEY `feGroup` (`feGroup`)
 
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 0;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 0;
 
 
 CREATE TABLE IF NOT EXISTS `Dirty`
 (
-  `id`                   INT(11)                                NOT NULL AUTO_INCREMENT,
-  `sip`                  VARCHAR(255)                           NOT NULL,
-  `tableName`            VARCHAR(255)                           NOT NULL,
-  `recordId`             INT(11)                                NOT NULL,
-  `expire`               DATETIME                               NOT NULL,
-  `recordHashMd5`        CHAR(32)                               NOT NULL,
-  `tabUniqId`            CHAR(32)                               NOT NULL,
-  `feUser`               VARCHAR(255)                           NOT NULL,
-  `qfqUserSessionCookie` VARCHAR(255)                           NOT NULL,
-  `dirtyMode`            ENUM ('exclusive', 'advisory', 'none') NOT NULL DEFAULT 'exclusive',
-  `remoteAddress`        VARCHAR(45)                            NOT NULL,
-  `modified`             DATETIME                               NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`              DATETIME                               NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`),
-  KEY `sip` (`sip`),
-  KEY `tableName` (`tableName`),
-  KEY `recordId` (`recordId`)
+    `id`                   INT(11)                                NOT NULL AUTO_INCREMENT,
+    `sip`                  VARCHAR(255)                           NOT NULL,
+    `tableName`            VARCHAR(255)                           NOT NULL,
+    `recordId`             INT(11)                                NOT NULL,
+    `expire`               DATETIME                               NOT NULL,
+    `recordHashMd5`        CHAR(32)                               NOT NULL,
+    `tabUniqId`            CHAR(32)                               NOT NULL,
+    `feUser`               VARCHAR(255)                           NOT NULL,
+    `qfqUserSessionCookie` VARCHAR(255)                           NOT NULL,
+    `dirtyMode`            ENUM ('exclusive', 'advisory', 'none') NOT NULL DEFAULT 'exclusive',
+    `remoteAddress`        VARCHAR(45)                            NOT NULL,
+    `modified`             DATETIME                               NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`              DATETIME                               NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`),
+    KEY `sip` (`sip`),
+    KEY `tableName` (`tableName`),
+    KEY `recordId` (`recordId`)
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 0;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 0;
 
 # Delete previous FormElements (if exist) of system forms
 DELETE FormElement
@@ -184,129 +185,137 @@ INSERT INTO FormElement (formId, name, label, mode, type, checkType, class, ord,
                          sql1, parameter, feIdContainer, subrecordOption, modeSql, placeholder, encode, dynamicUpdate,
                          checkPattern)
 VALUES
-  # Make the form a 'delete form' for records Form/FormElement.
-  (1, '', 'Delete FE', 'show', 'beforeDelete', 'all', 'action', 10, 0, 0, '', '', '', '',
-   'sqlAfter={{DELETE FROM FormElement WHERE formId={{id:R}} }}',
-   0, '', '', '', 'none', 'no', ''),
-
-  # Check for double form name
-  (1, '', 'Check for double form name', 'show', 'beforeSave', 'all', 'action', 20, 0, 0, '', '', '', '',
-   'sqlValidate={{!SELECT f.id FROM Form AS f WHERE  f.name!="" AND f.name="{{name:F:alnumx}}" AND f.id!={{id:R0}}  }}\nexpectRecords=0\nmessageFail=There is already another form with the name "{{name:F:alnumx}}".',
-   0, '', '', '', 'none', 'no', ''),
-
-  # Basic
-  (1, 'name', 'Name', 'required', 'text', 'pattern', 'native', 110, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-name">Info</a>', '', '', '',
-   'autofocus\ndata-pattern-error=Allowed characters: alphabet, number or . - +',
-   1, '', '', '', 'specialchar', 'no', '[a-zA-Z0-9._+-]+'),
-  (1, 'title', 'Title', 'show', 'text', 'all', 'native', 120, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-title">Info</a>',
-   '', '', '', '', 1, '', '', '', 'none', 'no', ''),
-  (1, 'noteInternal', 'Note', 'show', 'text', 'all', 'native', 130, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-note">Info</a>', '', '', '', '', 1, '', '', '', 'specialchar', 'no',
-   ''),
-  (1, 'tableName', 'Table', 'required', 'select', 'all', 'native', 140, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-tablename">Info</a>', '', '', '{{[{{indexData:Y}}]!SHOW tables}}',
-   'emptyItemAtStart', 1, '', '', '', 'specialchar', 'no', ''),
-  (1, 'parameterLanguageA', 'Language: {{formLanguageALabel:YE}}', 'show', 'text', 'all', 'native', 150, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
-   '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
-  (1, 'parameterLanguageB', 'Language: {{formLanguageBLabel:YE}}', 'show', 'text', 'all', 'native', 160, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
-   '{{SELECT IF("{{formLanguageBId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
-  (1, 'parameterLanguageC', 'Language: {{formLanguageCLabel:YE}}', 'show', 'text', 'all', 'native', 170, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
-   '{{SELECT IF("{{formLanguageCId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
-  (1, 'parameterLanguageD', 'Language: {{formLanguageDLabel:YE}}', 'show', 'text', 'all', 'native', 180, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
-   '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
-
-  # FormElement
-  (1, '', 'FormElements', 'show', 'subrecord', 'all', 'native', 210, 0, 0, '', '', '',
-   '{{!SELECT fe.ord AS _ord, IF( fe.enabled="yes", IF( fe.enabled="yes" AND fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "danger", IF( fe.class="container", "text-info",  IF( fe.class="action", "text-success", ""))), "text-muted") AS _rowClass, IF( fe.enabled="yes", IF(fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "Please choose a container for this formelement", fe.class), "Disabled") AS _rowTitle, fe.id AS _id, CONCAT(''<span id="qfq-dnd-ord-id-'', fe.id,''">'', fe.ord, ''</span><br><small class="text-muted">'',fe.id, ''</small>'') AS ''Ord|nostrip'', CONCAT( IFNULL( CONCAT( feC.name, " (", fe.feIdContainer, ")"),"")) AS Container, fe.name AS "Name|50", fe.label AS Label, fe.mode AS Mode, fe.class AS Class,	fe.type AS Type, IF(fe.dynamicUpdate="yes", \'<span class="glyphicon glyphicon-random"></span>\',"") AS "Dyn|nostrip" FROM FormElement AS fe LEFT JOIN FormElement AS feC ON feC.id=fe.feIdContainer AND feC.formId=fe.formId LEFT JOIN FormElement AS feCX ON feCX.class="container" AND feCX.enabled="yes" AND feCX.type="pill" AND feCX.formId=fe.formId WHERE fe.formId={{id:R0}} GROUP BY fe.id ORDER BY fe.ord, fe.id}}',
-   'form=formElement\ndetail=id:formId\nsubrecordTableClass=table table-hover qfq-subrecord-table qfq-color-grey-2 tablesorter tablesorter-filter tablesorter-column-selector',
-   2,
-   'new,edit,delete', '', '', 'none', 'no',
-   ''),
-
-  # Layout
-  (1, 'showButton', 'Show button', 'show', 'checkbox', 'all', 'native', 220, 0, 5,
-   '<a tabindex="-1" href="{{documentation:Y}}#showbutton">Info</a>', '', '', '',
-   'checkBoxMode = multi\norientation=vertical', 3, '',
-   '', '', 'specialchar', 'no', ''),
-  (1, 'labelAlign', 'Label Align', 'show', 'radio', 'alnumx', 'native', 225, 0, 5,
-   '<a tabindex="-1" href="{{documentation:Y}}#definition">Info</a>', '', '', '', 'buttonClass', 3, '',
-   '', '', 'specialchar', 'no', ''),
-  (1, 'parameter', 'Parameter', 'show', 'text', 'all', 'native', 230, '80,1,350', 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-parameter">Info</a>', '', '', '', '', 3, '', '', '', 'none', 'no',
-   ''),
-  (1, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 240, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-layout">Info</a>', '', '', '', '', 3, '', '',
-   '{{bsLabelColumns:Y}}',
-   'specialchar', 'no', ''),
-  (1, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 250, 0, 0, '', '', '', '', '', 3, '', '',
-   '{{bsInputColumns:Y}}', 'specialchar', 'no', ''),
-  (1, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 260, 0, 0, '', '', '', '', '', 3, '', '',
-   '{{bsNoteColumns:Y}}', 'specialchar', 'no', ''),
-
-
-  # Access
-  (1, 'forwardMode', 'Forward', 'show', 'radio', 'all', 'native', 310, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', 'buttonClass=btn-default', 4, '',
-   '', '',
-   'specialchar', 'no', ''),
-  (1, 'forwardPage', 'Forward URL / Page', 'show', 'text', 'all', 'native', 320, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', '', 4, '',
-   '', '', 'none', 'no', ''),
-  (1, 'requiredParameterNew', 'Required Parameter NEW', 'show', 'text', 'all', 'native', 330, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
-   'specialchar',
-   'no', ''),
-  (1, 'requiredParameterEdit', 'Required Parameter EDIT', 'show', 'text', 'all', 'native', 340, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
-   'specialchar',
-   'no', ''),
-  (1, 'permitNew', 'Permit New', 'show', 'radio', 'all', 'native', 350, 0, 10,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default', 4,
-   '', '', '',
-   'specialchar', 'no', ''),
-  (1, 'permitEdit', 'Permit Edit', 'show', 'radio', 'all', 'native', 360, 0, 10,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default', 4,
-   '', '', '',
-   'specialchar', 'no', ''),
-
-  (1, 'restMethod', 'Permit REST', 'show', 'checkbox', 'all', 'native', 370, 0, 10,
-   '<a tabindex="-1" 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,
-   '<a tabindex="-1" href="{{documentation:Y}}#variable-escape">Info</a>', '', '', '',
-   'itemList=c:config,s:single,d:double,l:ldap search,L:ldap value,m:mysql realEscapeString,-:none\nbuttonClass=btn-default',
-   4, '', '', '', 'specialchar', 'no', ''),
-  (1, 'dirtyMode', 'Record Locking', 'show', 'radio', 'all', 'native', 390, 0, 10,
-   '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '', '', '',
-   'buttonClass=btn-default', 4, '', '', '', 'specialchar', 'no', ''),
-  (1, 'recordLockTimeoutSeconds', 'Lock timeout (seconds)', 'show', 'text', 'all', 'native', 400, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '',
-   '{{SELECT IF("{{recordLockTimeoutSeconds:R0}}"=0,"{{recordLockTimeoutSeconds:Y0}}","{{recordLockTimeoutSeconds:R0}}")}}',
-   '', '', 4, '', '', '', 'specialchar', 'no', ''),
-  (1, 'primaryKey', 'Primary Key', 'show', 'text', 'all', 'native', 410, 0, 0,
-   '<a tabindex="-1" href="{{documentation:Y}}#form-primary-key">Info</a>', '', '', '', '', 4, '', '', 'id',
-   'specialchar', 'no', ''),
-
-  # Multi
-  (1, 'multi', 'Multi', 'show', 'fieldset', 'all', 'native', 510, 0, 0, '', '', '', '', '', 5, '', '', '',
-   'specialchar', 'no', ''),
-  (1, 'multiMode', 'Multi Mode', 'show', 'radio', 'all', 'native', 520, 0, 0, '', '', '', '', 'buttonClass', 5, '', '',
-   '',
-   'specialchar', 'no', ''),
-  (1, 'multiSql', 'Multi SQL', 'show', 'text', 'all', 'native', 530, '80,1,350', 0, '', '', '', '', '', 5, '', '', '',
-   'none', 'no', ''),
-  (1, 'multiDetailForm', 'Multi Detail Form', 'show', 'text', 'all', 'native', 540, 0, 0, '', '', '', '', '', 5,
-   '', '', '', 'specialchar', 'no', ''),
-  (1, 'multiDetailFormParameter', 'Multi Detail Form Parameter', 'show', 'text', 'all', 'native', 550, 0, 0, '', '',
-   '', '', '', 5, '', '', '', 'none', 'no', '');
+    # Make the form a 'delete form' for records Form/FormElement.
+    (1, '', 'Delete FE', 'show', 'beforeDelete', 'all', 'action', 10, 0, 0, '', '', '', '',
+     'sqlAfter={{DELETE FROM FormElement WHERE formId={{id:R}} }}',
+     0, '', '', '', 'none', 'no', ''),
+
+    # Check for double form name
+    (1, '', 'Check for double form name', 'show', 'beforeSave', 'all', 'action', 20, 0, 0, '', '', '', '',
+     'sqlValidate={{!SELECT f.id FROM Form AS f WHERE  f.name!="" AND f.name="{{name:F:alnumx}}" AND f.id!={{id:R0}}  }}\nexpectRecords=0\nmessageFail=There is already another form with the name "{{name:F:alnumx}}".',
+     0, '', '', '', 'none', 'no', ''),
+
+    # Basic
+    (1, 'name', 'Name', 'required', 'text', 'pattern', 'native', 110, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-name">Info</a>', '', '', '',
+     'autofocus\ndata-pattern-error=Allowed characters: alphabet, number or . - +',
+     1, '', '', '', 'specialchar', 'no', '[a-zA-Z0-9._+-]+'),
+    (1, 'title', 'Title', 'show', 'text', 'all', 'native', 120, '80,1,350', 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-title">Info</a>',
+     '', '', '', '', 1, '', '', '', 'none', 'no', ''),
+    (1, 'noteInternal', 'Note', 'show', 'text', 'all', 'native', 130, '80,1,350', 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-note">Info</a>', '', '', '', '', 1, '', '', '', 'specialchar',
+     'no',
+     ''),
+    (1, 'tableName', 'Table', 'required', 'select', 'all', 'native', 140, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-tablename">Info</a>', '', '', '{{[{{indexData:Y}}]!SHOW tables}}',
+     'emptyItemAtStart', 1, '', '', '', 'specialchar', 'no', ''),
+    (1, 'parameterLanguageA', 'Language: {{formLanguageALabel:YE}}', 'show', 'text', 'all', 'native', 150, '80,1,350',
+     0,
+     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
+    (1, 'parameterLanguageB', 'Language: {{formLanguageBLabel:YE}}', 'show', 'text', 'all', 'native', 160, '80,1,350',
+     0,
+     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     '{{SELECT IF("{{formLanguageBId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
+    (1, 'parameterLanguageC', 'Language: {{formLanguageCLabel:YE}}', 'show', 'text', 'all', 'native', 170, '80,1,350',
+     0,
+     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     '{{SELECT IF("{{formLanguageCId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
+    (1, 'parameterLanguageD', 'Language: {{formLanguageDLabel:YE}}', 'show', 'text', 'all', 'native', 180, '80,1,350',
+     0,
+     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
+
+    # FormElement
+    (1, '', 'FormElements', 'show', 'subrecord', 'all', 'native', 210, 0, 0, '', '', '',
+     '{{!SELECT fe.ord AS _ord, IF( fe.enabled="yes", IF( fe.enabled="yes" AND fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "danger", IF( fe.class="container", "text-info",  IF( fe.class="action", "text-success", ""))), "text-muted") AS _rowClass, IF( fe.enabled="yes", IF(fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "Please choose a container for this formelement", fe.class), "Disabled") AS _rowTitle, fe.id AS _id, CONCAT(''<span id="qfq-dnd-ord-id-'', fe.id,''">'', fe.ord, ''</span><br><small class="text-muted">'',fe.id, ''</small>'') AS ''Ord|nostrip'', CONCAT( IFNULL( CONCAT( feC.name, " (", fe.feIdContainer, ")"),"")) AS Container, fe.name AS "Name|50", fe.label AS Label, fe.mode AS Mode, fe.class AS Class,	fe.type AS Type, IF(fe.dynamicUpdate="yes", \'<span class="glyphicon glyphicon-random"></span>\',"") AS "Dyn|nostrip" FROM FormElement AS fe LEFT JOIN FormElement AS feC ON feC.id=fe.feIdContainer AND feC.formId=fe.formId LEFT JOIN FormElement AS feCX ON feCX.class="container" AND feCX.enabled="yes" AND feCX.type="pill" AND feCX.formId=fe.formId WHERE fe.formId={{id:R0}} GROUP BY fe.id ORDER BY fe.ord, fe.id}}',
+     'form=formElement\ndetail=id:formId\nsubrecordTableClass=table table-hover qfq-subrecord-table qfq-color-grey-2 tablesorter tablesorter-filter tablesorter-column-selector',
+     2,
+     'new,edit,delete', '', '', 'none', 'no',
+     ''),
+
+    # Layout
+    (1, 'showButton', 'Show button', 'show', 'checkbox', 'all', 'native', 220, 0, 5,
+     '<a tabindex="-1" href="{{documentation:Y}}#showbutton">Info</a>', '', '', '',
+     'checkBoxMode = multi\norientation=vertical', 3, '',
+     '', '', 'specialchar', 'no', ''),
+    (1, 'labelAlign', 'Label Align', 'show', 'radio', 'alnumx', 'native', 225, 0, 5,
+     '<a tabindex="-1" href="{{documentation:Y}}#definition">Info</a>', '', '', '', 'buttonClass', 3, '',
+     '', '', 'specialchar', 'no', ''),
+    (1, 'parameter', 'Parameter', 'show', 'text', 'all', 'native', 230, '80,1,350', 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-parameter">Info</a>', '', '', '', '', 3, '', '', '', 'none', 'no',
+     ''),
+    (1, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 240, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-layout">Info</a>', '', '', '', '', 3, '', '',
+     '{{bsLabelColumns:Y}}',
+     'specialchar', 'no', ''),
+    (1, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 250, 0, 0, '', '', '', '', '', 3, '', '',
+     '{{bsInputColumns:Y}}', 'specialchar', 'no', ''),
+    (1, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 260, 0, 0, '', '', '', '', '', 3, '', '',
+     '{{bsNoteColumns:Y}}', 'specialchar', 'no', ''),
+
+
+    # Access
+    (1, 'forwardMode', 'Forward', 'show', 'radio', 'all', 'native', 310, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', 'buttonClass=btn-default', 4, '',
+     '', '',
+     'specialchar', 'no', ''),
+    (1, 'forwardPage', 'Forward URL / Page', 'show', 'text', 'all', 'native', 320, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', '', 4, '',
+     '', '', 'none', 'no', ''),
+    (1, 'requiredParameterNew', 'Required Parameter NEW', 'show', 'text', 'all', 'native', 330, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
+     'specialchar',
+     'no', ''),
+    (1, 'requiredParameterEdit', 'Required Parameter EDIT', 'show', 'text', 'all', 'native', 340, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
+     'specialchar',
+     'no', ''),
+    (1, 'permitNew', 'Permit New', 'show', 'radio', 'all', 'native', 350, 0, 10,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default',
+     4,
+     '', '', '',
+     'specialchar', 'no', ''),
+    (1, 'permitEdit', 'Permit Edit', 'show', 'radio', 'all', 'native', 360, 0, 10,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default',
+     4,
+     '', '', '',
+     'specialchar', 'no', ''),
+
+    (1, 'restMethod', 'Permit REST', 'show', 'checkbox', 'all', 'native', 370, 0, 10,
+     '<a tabindex="-1" 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,
+     '<a tabindex="-1" href="{{documentation:Y}}#variable-escape">Info</a>', '', '', '',
+     'itemList=c:config,s:single,d:double,l:ldap search,L:ldap value,m:mysql realEscapeString,-:none\nbuttonClass=btn-default',
+     4, '', '', '', 'specialchar', 'no', ''),
+    (1, 'dirtyMode', 'Record Locking', 'show', 'radio', 'all', 'native', 390, 0, 10,
+     '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '', '', '',
+     'buttonClass=btn-default', 4, '', '', '', 'specialchar', 'no', ''),
+    (1, 'recordLockTimeoutSeconds', 'Lock timeout (seconds)', 'show', 'text', 'all', 'native', 400, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '',
+     '{{SELECT IF("{{recordLockTimeoutSeconds:R0}}"=0,"{{recordLockTimeoutSeconds:Y0}}","{{recordLockTimeoutSeconds:R0}}")}}',
+     '', '', 4, '', '', '', 'specialchar', 'no', ''),
+    (1, 'primaryKey', 'Primary Key', 'show', 'text', 'all', 'native', 410, 0, 0,
+     '<a tabindex="-1" href="{{documentation:Y}}#form-primary-key">Info</a>', '', '', '', '', 4, '', '', 'id',
+     'specialchar', 'no', ''),
+
+    # Multi
+    (1, 'multi', 'Multi', 'show', 'fieldset', 'all', 'native', 510, 0, 0, '', '', '', '', '', 5, '', '', '',
+     'specialchar', 'no', ''),
+    (1, 'multiMode', 'Multi Mode', 'show', 'radio', 'all', 'native', 520, 0, 0, '', '', '', '', 'buttonClass', 5, '',
+     '',
+     '',
+     'specialchar', 'no', ''),
+    (1, 'multiSql', 'Multi SQL', 'show', 'text', 'all', 'native', 530, '80,1,350', 0, '', '', '', '', '', 5, '', '', '',
+     'none', 'no', ''),
+    (1, 'multiDetailForm', 'Multi Detail Form', 'show', 'text', 'all', 'native', 540, 0, 0, '', '', '', '', '', 5,
+     '', '', '', 'specialchar', 'no', ''),
+    (1, 'multiDetailFormParameter', 'Multi Detail Form Parameter', 'show', 'text', 'all', 'native', 550, 0, 0, '', '',
+     '', '', '', 5, '', '', '', 'none', 'no', '');
 
 
 #
@@ -512,67 +521,67 @@ VALUES (NULL, '2', '0', 'no', 'yes', 'Check Name Conflict', '', 'show', '', 'act
 #DROP TABLE IF EXISTS `MailLog`;
 CREATE TABLE IF NOT EXISTS `MailLog`
 (
-  `id`       INT(11)       NOT NULL AUTO_INCREMENT,
-  `grId`     INT(11)       NOT NULL DEFAULT '0',
-  `xId`      INT(11)       NOT NULL DEFAULT '0',
-  `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,
-  `header`   VARCHAR(255)  NOT NULL DEFAULT '',
-  `attach`   VARCHAR(1024) NOT NULL DEFAULT '',
-  `src`      VARCHAR(255)  NOT NULL DEFAULT '',
-  `modified` DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`  DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`)
+    `id`       INT(11)       NOT NULL AUTO_INCREMENT,
+    `grId`     INT(11)       NOT NULL DEFAULT '0',
+    `xId`      INT(11)       NOT NULL DEFAULT '0',
+    `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,
+    `header`   VARCHAR(255)  NOT NULL DEFAULT '',
+    `attach`   VARCHAR(1024) NOT NULL DEFAULT '',
+    `src`      VARCHAR(255)  NOT NULL DEFAULT '',
+    `modified` DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`  DATETIME      NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`)
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 0;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 0;
 
 CREATE TABLE IF NOT EXISTS `FormSubmitLog`
 (
-  `id`        INT(11)     NOT NULL AUTO_INCREMENT,
-  `formData`  TEXT        NOT NULL,
-  `sipData`   TEXT        NOT NULL,
-  `clientIp`  VARCHAR(64) NOT NULL,
-  `feUser`    VARCHAR(64) NOT NULL,
-  `userAgent` TEXT        NOT NULL,
-  `formId`    INT(11)     NOT NULL,
-  `recordId`  INT(11)     NOT NULL,
-  `pageId`    INT         NOT NULL,
-  `sessionId` VARCHAR(32) NOT NULL,
-  `created`   TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`),
-  INDEX (`feUser`),
-  INDEX (`formId`)
+    `id`        INT(11)     NOT NULL AUTO_INCREMENT,
+    `formData`  TEXT        NOT NULL,
+    `sipData`   TEXT        NOT NULL,
+    `clientIp`  VARCHAR(64) NOT NULL,
+    `feUser`    VARCHAR(64) NOT NULL,
+    `userAgent` TEXT        NOT NULL,
+    `formId`    INT(11)     NOT NULL,
+    `recordId`  INT(11)     NOT NULL,
+    `pageId`    INT         NOT NULL,
+    `sessionId` VARCHAR(32) NOT NULL,
+    `created`   TIMESTAMP   NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`),
+    INDEX (`feUser`),
+    INDEX (`formId`)
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 0;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 0;
 
 
 CREATE TABLE IF NOT EXISTS `Clipboard`
 (
-  `id`          INT(11)      NOT NULL AUTO_INCREMENT,
-  `cookie`      VARCHAR(255) NOT NULL DEFAULT '',
-  `formIdPaste` INT(11)      NOT NULL DEFAULT '0',
-  `idSrc`       INT(11)      NOT NULL DEFAULT '0',
-  `xId`         INT(11)      NOT NULL DEFAULT '0',
-  `modified`    DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`     DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`)
+    `id`          INT(11)      NOT NULL AUTO_INCREMENT,
+    `cookie`      VARCHAR(255) NOT NULL DEFAULT '',
+    `formIdPaste` INT(11)      NOT NULL DEFAULT '0',
+    `idSrc`       INT(11)      NOT NULL DEFAULT '0',
+    `xId`         INT(11)      NOT NULL DEFAULT '0',
+    `modified`    DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`     DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`)
 )
-  ENGINE = InnoDB
-  DEFAULT CHARSET = utf8
-  AUTO_INCREMENT = 0;
+    ENGINE = InnoDB
+    DEFAULT CHARSET = utf8
+    AUTO_INCREMENT = 0;
 
 # Form: CopyForm
 INSERT INTO Form (id, name, title, tableName, showButton, forwardMode, forwardPage, parameter)
@@ -598,31 +607,31 @@ VALUES (3, 'idSrc', 'Source Form', 'select', 'native', 10,
 # AutoCRON
 CREATE TABLE IF NOT EXISTS `Cron`
 (
-  `id`            INT(11)                      NOT NULL AUTO_INCREMENT,
-  `grId`          INT(11)                      NOT NULL,
-  `xId`           INT(11)                      NOT NULL,
-  `type`          ENUM ('mail', 'website')     NOT NULL DEFAULT 'website',
-  `lastRun`       DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `lastStatus`    TEXT                         NOT NULL,
-  `nextRun`       DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `frequency`     VARCHAR(32)                  NOT NULL,
-  `inProgress`    DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
-  `status`        ENUM ('enable', 'disable')   NOT NULL DEFAULT 'enable',
-  `sql1`          TEXT                         NOT NULL,
-  `content`       TEXT                         NOT NULL,
-  `comment`       TEXT                         NOT NULL,
-  `outputFile`    VARCHAR(255)                 NOT NULL,
-  `outputMode`    ENUM ('overwrite', 'append') NOT NULL DEFAULT 'append',
-  `outputPattern` VARCHAR(255)                 NOT NULL,
-  `autoGenerated` ENUM ('yes', 'no')           NOT NULL DEFAULT 'no',
-  `modified`      DATETIME                     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`       DATETIME                     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`)
+    `id`            INT(11)                      NOT NULL AUTO_INCREMENT,
+    `grId`          INT(11)                      NOT NULL,
+    `xId`           INT(11)                      NOT NULL,
+    `type`          ENUM ('mail', 'website')     NOT NULL DEFAULT 'website',
+    `lastRun`       DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
+    `lastStatus`    TEXT                         NOT NULL,
+    `nextRun`       DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
+    `frequency`     VARCHAR(32)                  NOT NULL,
+    `inProgress`    DATETIME                     NOT NULL DEFAULT '0000-00-00 00:00:00',
+    `status`        ENUM ('enable', 'disable')   NOT NULL DEFAULT 'enable',
+    `sql1`          TEXT                         NOT NULL,
+    `content`       TEXT                         NOT NULL,
+    `comment`       TEXT                         NOT NULL,
+    `outputFile`    VARCHAR(255)                 NOT NULL,
+    `outputMode`    ENUM ('overwrite', 'append') NOT NULL DEFAULT 'append',
+    `outputPattern` VARCHAR(255)                 NOT NULL,
+    `autoGenerated` ENUM ('yes', 'no')           NOT NULL DEFAULT 'no',
+    `modified`      DATETIME                     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`       DATETIME                     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`)
 )
-  ENGINE = InnoDB
-  AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8;
+    ENGINE = InnoDB
+    AUTO_INCREMENT = 0
+    DEFAULT CHARSET = utf8;
 
 # Form: AutoCron
 INSERT INTO Form (id, name, title, tableName, parameter, dirtyMode)
@@ -674,33 +683,33 @@ VALUES (4, 'status', 'Enabled', 'show', '', 'checkbox', 'specialchar', 'alnumx',
 
 CREATE TABLE IF NOT EXISTS `Split`
 (
-  `id`           INT(11)      NOT NULL AUTO_INCREMENT,
-  `tableName`    VARCHAR(255) NOT NULL,
-  `xId`          INT(11)      NOT NULL,
-  `pathFileName` VARCHAR(255) NOT NULL,
-  `modified`     DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
-
-  PRIMARY KEY (`id`)
+    `id`           INT(11)      NOT NULL AUTO_INCREMENT,
+    `tableName`    VARCHAR(255) NOT NULL,
+    `xId`          INT(11)      NOT NULL,
+    `pathFileName` VARCHAR(255) NOT NULL,
+    `modified`     DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`      DATETIME     NOT NULL DEFAULT CURRENT_TIMESTAMP,
+
+    PRIMARY KEY (`id`)
 )
-  ENGINE = InnoDB
-  AUTO_INCREMENT = 0
-  DEFAULT CHARSET = utf8;
+    ENGINE = InnoDB
+    AUTO_INCREMENT = 0
+    DEFAULT CHARSET = utf8;
 
 CREATE TABLE IF NOT EXISTS `Setting`
 (
-  `id`       INT(11)                  NOT NULL AUTO_INCREMENT,
-  `type`     ENUM ('', 'tablesorter') NOT NULL,
-  `readonly` ENUM ('yes', 'no')       NOT NULL DEFAULT 'no' COMMENT 'Settings can''t be modified.',
-  `name`     VARCHAR(64)              NOT NULL,
-  `public`   TINYINT(1)               NOT NULL,
-  `feUser`   VARCHAR(32)              NOT NULL COMMENT 'In case there is no logged in user, take QFQ cookie.',
-  `tableId`  VARCHAR(64)              NOT NULL,
-  `view`     TEXT                     NOT NULL,
-  `modified` DATETIME                 NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  `created`  DATETIME                 NOT NULL DEFAULT CURRENT_TIMESTAMP,
-  PRIMARY KEY (`id`),
-  KEY `name` (`name`),
-  KEY `typeFeUserUidTableIdPublic` (`type`, `feUser`, `tableId`, `public`) USING BTREE
+    `id`       INT(11)                  NOT NULL AUTO_INCREMENT,
+    `type`     ENUM ('', 'tablesorter') NOT NULL,
+    `readonly` ENUM ('yes', 'no')       NOT NULL DEFAULT 'no' COMMENT 'Settings can''t be modified.',
+    `name`     VARCHAR(64)              NOT NULL,
+    `public`   TINYINT(1)               NOT NULL,
+    `feUser`   VARCHAR(32)              NOT NULL COMMENT 'In case there is no logged in user, take QFQ cookie.',
+    `tableId`  VARCHAR(64)              NOT NULL,
+    `view`     TEXT                     NOT NULL,
+    `modified` DATETIME                 NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+    `created`  DATETIME                 NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    PRIMARY KEY (`id`),
+    KEY `name` (`name`),
+    KEY `typeFeUserUidTableIdPublic` (`type`, `feUser`, `tableId`, `public`) USING BTREE
 ) ENGINE = InnoDB
   DEFAULT CHARSET = utf8mb4;
\ No newline at end of file
-- 
GitLab


From c73355773de2e931813040dc375341653037a3d7 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 29 Feb 2020 11:24:48 +0100
Subject: [PATCH 41/48] fix typo

---
 extension/Classes/Core/Report/Report.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/Classes/Core/Report/Report.php b/extension/Classes/Core/Report/Report.php
index 48007257..13bd0939 100644
--- a/extension/Classes/Core/Report/Report.php
+++ b/extension/Classes/Core/Report/Report.php
@@ -677,7 +677,7 @@ class Report {
 
     /**
      * Called with an array of column names.
-     * Each column name can be splitted in multiple string by '|': [s1[|s2[|s3]]]
+     * Each column name can be split in multiple string by '|': [s1[|s2[|s3]]]
      * Each s1|s2|s3 can be:  {title}, _{special colum name}, _hide, _noWrap, _={title},  _+{tag}, _<{tag1}><{tag2}>
      *
      * Return an Array: newKeys[idx][C_FULL|C_TITLE|C_NO_WRAP|C_HIDE]
@@ -688,7 +688,7 @@ class Report {
      */
     private function splitColumnNames(array $keys, array $fSkipWrap = array()) {
 
-        // Split Keynames in title / specialColumnName / fSkipWrap / hide
+        // Split key names in title / specialColumnName / fSkipWrap / hide
         $ii = 0;
         $newKeys = array();
 
-- 
GitLab


From ed6a62f3f5ef33bb13828797cc3d44a4e706315e Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 29 Feb 2020 14:03:11 +0100
Subject: [PATCH 42/48] reformat

---
 extension/Classes/Sql/formEditor.sql | 201 +++++++++------------------
 1 file changed, 68 insertions(+), 133 deletions(-)

diff --git a/extension/Classes/Sql/formEditor.sql b/extension/Classes/Sql/formEditor.sql
index c1d61e9d..6b7fdbcf 100644
--- a/extension/Classes/Sql/formEditor.sql
+++ b/extension/Classes/Sql/formEditor.sql
@@ -187,8 +187,7 @@ INSERT INTO FormElement (formId, name, label, mode, type, checkType, class, ord,
 VALUES
     # Make the form a 'delete form' for records Form/FormElement.
     (1, '', 'Delete FE', 'show', 'beforeDelete', 'all', 'action', 10, 0, 0, '', '', '', '',
-     'sqlAfter={{DELETE FROM FormElement WHERE formId={{id:R}} }}',
-     0, '', '', '', 'none', 'no', ''),
+     'sqlAfter={{DELETE FROM FormElement WHERE formId={{id:R}} }}', 0, '', '', '', 'none', 'no', ''),
 
     # Check for double form name
     (1, '', 'Check for double form name', 'show', 'beforeSave', 'all', 'action', 20, 0, 0, '', '', '', '',
@@ -205,8 +204,7 @@ VALUES
      '', '', '', '', 1, '', '', '', 'none', 'no', ''),
     (1, 'noteInternal', 'Note', 'show', 'text', 'all', 'native', 130, '80,1,350', 0,
      '<a tabindex="-1" href="{{documentation:Y}}#form-note">Info</a>', '', '', '', '', 1, '', '', '', 'specialchar',
-     'no',
-     ''),
+     'no', ''),
     (1, 'tableName', 'Table', 'required', 'select', 'all', 'native', 140, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#form-tablename">Info</a>', '', '', '{{[{{indexData:Y}}]!SHOW tables}}',
      'emptyItemAtStart', 1, '', '', '', 'specialchar', 'no', ''),
@@ -215,41 +213,34 @@ VALUES
      '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
      '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
     (1, 'parameterLanguageB', 'Language: {{formLanguageBLabel:YE}}', 'show', 'text', 'all', 'native', 160, '80,1,350',
-     0,
-     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
      '{{SELECT IF("{{formLanguageBId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
     (1, 'parameterLanguageC', 'Language: {{formLanguageCLabel:YE}}', 'show', 'text', 'all', 'native', 170, '80,1,350',
-     0,
-     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
      '{{SELECT IF("{{formLanguageCId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
     (1, 'parameterLanguageD', 'Language: {{formLanguageDLabel:YE}}', 'show', 'text', 'all', 'native', 180, '80,1,350',
-     0,
-     '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
+     0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 1, '',
      '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none', 'no', ''),
 
     # FormElement
     (1, '', 'FormElements', 'show', 'subrecord', 'all', 'native', 210, 0, 0, '', '', '',
      '{{!SELECT fe.ord AS _ord, IF( fe.enabled="yes", IF( fe.enabled="yes" AND fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "danger", IF( fe.class="container", "text-info",  IF( fe.class="action", "text-success", ""))), "text-muted") AS _rowClass, IF( fe.enabled="yes", IF(fe.feIdContainer=0 AND !ISNULL(feCX.id) AND fe.class="native", "Please choose a container for this formelement", fe.class), "Disabled") AS _rowTitle, fe.id AS _id, CONCAT(''<span id="qfq-dnd-ord-id-'', fe.id,''">'', fe.ord, ''</span><br><small class="text-muted">'',fe.id, ''</small>'') AS ''Ord|nostrip'', CONCAT( IFNULL( CONCAT( feC.name, " (", fe.feIdContainer, ")"),"")) AS Container, fe.name AS "Name|50", fe.label AS Label, fe.mode AS Mode, fe.class AS Class,	fe.type AS Type, IF(fe.dynamicUpdate="yes", \'<span class="glyphicon glyphicon-random"></span>\',"") AS "Dyn|nostrip" FROM FormElement AS fe LEFT JOIN FormElement AS feC ON feC.id=fe.feIdContainer AND feC.formId=fe.formId LEFT JOIN FormElement AS feCX ON feCX.class="container" AND feCX.enabled="yes" AND feCX.type="pill" AND feCX.formId=fe.formId WHERE fe.formId={{id:R0}} GROUP BY fe.id ORDER BY fe.ord, fe.id}}',
      'form=formElement\ndetail=id:formId\nsubrecordTableClass=table table-hover qfq-subrecord-table qfq-color-grey-2 tablesorter tablesorter-filter tablesorter-column-selector',
-     2,
-     'new,edit,delete', '', '', 'none', 'no',
-     ''),
+     2, 'new,edit,delete', '', '', 'none', 'no', ''),
 
     # Layout
     (1, 'showButton', 'Show button', 'show', 'checkbox', 'all', 'native', 220, 0, 5,
      '<a tabindex="-1" href="{{documentation:Y}}#showbutton">Info</a>', '', '', '',
-     'checkBoxMode = multi\norientation=vertical', 3, '',
-     '', '', 'specialchar', 'no', ''),
+     'checkBoxMode = multi\norientation=vertical', 3, '', '', '', 'specialchar', 'no', ''),
     (1, 'labelAlign', 'Label Align', 'show', 'radio', 'alnumx', 'native', 225, 0, 5,
-     '<a tabindex="-1" href="{{documentation:Y}}#definition">Info</a>', '', '', '', 'buttonClass', 3, '',
-     '', '', 'specialchar', 'no', ''),
+     '<a tabindex="-1" href="{{documentation:Y}}#definition">Info</a>', '', '', '', 'buttonClass', 3, '', '', '',
+     'specialchar', 'no', ''),
     (1, 'parameter', 'Parameter', 'show', 'text', 'all', 'native', 230, '80,1,350', 0,
      '<a tabindex="-1" href="{{documentation:Y}}#form-parameter">Info</a>', '', '', '', '', 3, '', '', '', 'none', 'no',
      ''),
     (1, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 240, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#form-layout">Info</a>', '', '', '', '', 3, '', '',
-     '{{bsLabelColumns:Y}}',
-     'specialchar', 'no', ''),
+     '{{bsLabelColumns:Y}}', 'specialchar', 'no', ''),
     (1, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 250, 0, 0, '', '', '', '', '', 3, '', '',
      '{{bsInputColumns:Y}}', 'specialchar', 'no', ''),
     (1, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 260, 0, 0, '', '', '', '', '', 3, '', '',
@@ -259,42 +250,34 @@ VALUES
     # Access
     (1, 'forwardMode', 'Forward', 'show', 'radio', 'all', 'native', 310, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', 'buttonClass=btn-default', 4, '',
-     '', '',
-     'specialchar', 'no', ''),
+     '', '', 'specialchar', 'no', ''),
     (1, 'forwardPage', 'Forward URL / Page', 'show', 'text', 'all', 'native', 320, 0, 0,
-     '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', '', 4, '',
-     '', '', 'none', 'no', ''),
+     '<a tabindex="-1" href="{{documentation:Y}}#form-forward">Info</a>', '', '', '', '', 4, '', '', '', 'none', 'no',
+     ''),
     (1, 'requiredParameterNew', 'Required Parameter NEW', 'show', 'text', 'all', 'native', 330, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
-     'specialchar',
-     'no', ''),
+     'specialchar', 'no', ''),
     (1, 'requiredParameterEdit', 'Required Parameter EDIT', 'show', 'text', 'all', 'native', 340, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#required-parameter-new-edit">Info</a>', '', '', '', '', 4, '', '', '',
-     'specialchar',
-     'no', ''),
+     'specialchar', 'no', ''),
     (1, 'permitNew', 'Permit New', 'show', 'radio', 'all', 'native', 350, 0, 10,
      '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default',
-     4,
-     '', '', '',
-     'specialchar', 'no', ''),
+     4, '', '', '', 'specialchar', 'no', ''),
     (1, 'permitEdit', 'Permit Edit', 'show', 'radio', 'all', 'native', 360, 0, 10,
      '<a tabindex="-1" href="{{documentation:Y}}#form-permitnewedit">Info</a>', '', '', '', 'buttonClass=btn-default',
-     4,
-     '', '', '',
-     'specialchar', 'no', ''),
+     4, '', '', '', 'specialchar', 'no', ''),
 
     (1, 'restMethod', 'Permit REST', 'show', 'checkbox', 'all', 'native', 370, 0, 10,
      '<a tabindex="-1" href="{{documentation:Y}}#rest">Info</a>', '', '', '',
-     'buttonClass=btn-default\nitemList=get,post:insert,put:update,delete', 4, '', '', '',
-     'specialchar', 'no', ''),
+     '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,
      '<a tabindex="-1" href="{{documentation:Y}}#variable-escape">Info</a>', '', '', '',
      'itemList=c:config,s:single,d:double,l:ldap search,L:ldap value,m:mysql realEscapeString,-:none\nbuttonClass=btn-default',
      4, '', '', '', 'specialchar', 'no', ''),
     (1, 'dirtyMode', 'Record Locking', 'show', 'radio', 'all', 'native', 390, 0, 10,
-     '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '', '', '',
-     'buttonClass=btn-default', 4, '', '', '', 'specialchar', 'no', ''),
+     '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '', '', '', 'buttonClass=btn-default', 4,
+     '', '', '', 'specialchar', 'no', ''),
     (1, 'recordLockTimeoutSeconds', 'Lock timeout (seconds)', 'show', 'text', 'all', 'native', 400, 0, 0,
      '<a tabindex="-1" href="{{documentation:Y}}#locking-record">Info</a>', '',
      '{{SELECT IF("{{recordLockTimeoutSeconds:R0}}"=0,"{{recordLockTimeoutSeconds:Y0}}","{{recordLockTimeoutSeconds:R0}}")}}',
@@ -307,9 +290,7 @@ VALUES
     (1, 'multi', 'Multi', 'show', 'fieldset', 'all', 'native', 510, 0, 0, '', '', '', '', '', 5, '', '', '',
      'specialchar', 'no', ''),
     (1, 'multiMode', 'Multi Mode', 'show', 'radio', 'all', 'native', 520, 0, 0, '', '', '', '', 'buttonClass', 5, '',
-     '',
-     '',
-     'specialchar', 'no', ''),
+     '', '', 'specialchar', 'no', ''),
     (1, 'multiSql', 'Multi SQL', 'show', 'text', 'all', 'native', 530, '80,1,350', 0, '', '', '', '', '', 5, '', '', '',
      'none', 'no', ''),
     (1, 'multiDetailForm', 'Multi Detail Form', 'show', 'text', 'all', 'native', 540, 0, 0, '', '', '', '', '', 5,
@@ -324,8 +305,7 @@ INSERT INTO Form (id, name, title, noteInternal, tableName, permitNew, permitEdi
                   requiredParameterNew)
 VALUES (2, 'formElement',
         'Form Element Editor. Form : {{SELECT f.id, " / ",  f.name  FROM Form AS f WHERE f.id = {{formId:SR0}}  }} (DB: {{dbNameQfq:Y}})',
-        'Please secure the form',
-        'FormElement', 'sip', 'sip', 'bootstrap', '',
+        'Please secure the form', 'FormElement', 'sip', 'sip', 'bootstrap', '',
         'maxVisiblePill=5\nclassBody=qfq-color-blue-1\ndbIndex={{indexQfq:Y}}', 'formId');
 
 # FormEditor: FormElements for 'formElement'
@@ -344,39 +324,32 @@ VALUES (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120,
         '<a tabindex="-1" href="{{documentation:Y}}#class-container">Info</a>', '',
         '{{feIdContainer:FR:::{{SELECT fe.feIdContainer FROM FormElement AS fe WHERE fe.formId={{formId:SR0}} AND fe.feIdContainer!=0 AND "{{class:FRD0:alnumx}}"!="action" ORDER BY fe.modified DESC LIMIT 1}}}}',
         '{{!SELECT fe.id, CONCAT(fe.type, " / ", fe.name, " (", COUNT(feSub.id), ")" ) FROM FormElement As fe LEFT JOIN FormElement As feSub ON feSub.feIdContainer=fe.id WHERE fe.formId={{formId:SR0}} AND fe.class="container"  AND ("{{class:FRD0:alnumx}}"!="action" OR fe.type="templateGroup") GROUP BY fe.id ORDER BY fe.type, fe.ord, fe.name }}',
-        'emptyItemAtStart',
-        100, '', 'yes', '', '', '',
+        'emptyItemAtStart', 100, '', 'yes', '', '', '',
         '{{SELECT IF(COUNT(fe.id)>0, "show", "hidden") FROM Form AS f LEFT JOIN FormElement AS fe ON f.id=fe.formId AND fe.class="container" WHERE f.id={{formId:S0}} GROUP BY f.id}}',
         '', 'specialchar'),
        (2, 'enabled', 'Enabled', 'show', 'checkbox', 'all', 'native', 130, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', '', '', '', '', 100, '', 'no', '', '', '',
-        '', '',
-        'specialchar'),
+        '', '', 'specialchar'),
        (2, 'dynamicUpdate', 'Dynamic Update', 'show', 'checkbox', 'all', 'native', 135, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#dynamic-update">Info</a>',
-        '', '', '', '', 100, '', 'no', '', '', '', '', '', 'specialchar'),
+        '<a tabindex="-1" href="{{documentation:Y}}#dynamic-update">Info</a>', '', '', '', '', 100, '', 'no', '', '',
+        '', '', '', 'specialchar'),
        (2, 'name', 'Name', 'show', 'text', 'all', 'native', 140, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>',
-        '', '', '',
+        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', '', '', '',
         'typeAheadSql = [{{indexData:Y}}]SELECT COLUMN_NAME FROM information_schema.columns WHERE table_schema = "{{DB_1_NAME:Y}}" AND table_name = "{{SELECT f.tableName FROM Form AS f WHERE f.id={{formId:S0}}}}" AND COLUMN_NAME LIKE ? ORDER BY COLUMN_NAME\ntypeAheadMinLength = 1\ntypeAheadLimit = 100\ntypeAheadPedantic = 0\n',
         100, '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', 'no', '', '', '', '', '',
         'specialchar'),
        (2, 'label', 'Label', 'show', 'text', 'all', 'native', 150, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>',
-        '', '', '', '', 100, '', 'no', '', '', '', '', '', 'none'),
+        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', '', '', '', '', 100, '', 'no', '', '', '',
+        '', '', 'none'),
        (2, 'mode', 'Mode', 'show', 'radio', 'all', 'native', 160, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>',
-        '', '', '', 'buttonClass=btn-default', 100, '', 'no', '', '', '', '', '', 'specialchar'),
+        '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', '', '', '', 'buttonClass=btn-default', 100,
+        '', 'no', '', '', '', '', '', 'specialchar'),
        (2, 'modeSql', 'Mode sql', 'show', 'text', 'all', 'native', 170, '80,1,350', 0,
         '<a tabindex="-1" href="{{documentation:Y}}#dynamic-update">Info</a>', '', '', '', '', 100, '', 'no', '', '',
-        '', '', '',
-        'none'),
+        '', '', '', 'none'),
        (2, 'class', 'Class', 'show', 'radio', 'all', 'native', 180, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#class-container">Info</a>', '', '{{class:FSRD0:alnumx}}', '',
-        'buttonClass',
-        100, '', 'yes',
-        '', '',
-        '', '', '', 'none'),
+        'buttonClass', 100, '', 'yes', '', '', '', '', '', 'none'),
 
        (2, 'type', 'Type', 'show', 'select', 'all', 'native', 190, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#class-native">Native</a>, <a tabindex="-1" href="{{documentation:Y}}#class-action">Action</a>, <a tabindex="-1" href="{{documentation:Y}}#class-container">Container</a>',
@@ -384,51 +357,34 @@ VALUES (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120,
         'itemList={{SELECT IF( "{{class:FRD0:alnumx}}"="native","checkbox,date,time,datetime,dateJQW,datetimeJQW,extra,gridJQW,text,editor,annotate,imageCut,note,password,radio,select,subrecord,upload", IF("{{class:FRD0:alnumx}}"="action","beforeLoad,beforeSave,beforeInsert,beforeUpdate,beforeDelete,afterLoad,afterSave,afterInsert,afterUpdate,afterDelete,sendMail,paste", "fieldset,pill,templateGroup")  ) }}',
         100, '', 'yes', '', '', '', '', '', 'specialchar'),
        (2, 'subrecordOption', 'Subrecord Option', 'show', 'checkbox', 'all', 'native', 200, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#subrecord-option">Info</a>', '', '', '',
-        '', 100, '', 'yes', '', '', '',
-        '{{ SELECT IF("{{type:FRE:alnumx}}"="subrecord" AND "{{class:FRE:alnumx}}"="native", "show", "hidden") }}', '',
-        'specialchar'),
+        '<a tabindex="-1" href="{{documentation:Y}}#subrecord-option">Info</a>', '', '', '', '', 100, '', 'yes', '', '',
+        '', '{{ SELECT IF("{{type:FRE:alnumx}}"="subrecord" AND "{{class:FRE:alnumx}}"="native", "show", "hidden") }}',
+        '', 'specialchar'),
        (2, 'parameterLanguageA', 'Language: {{formLanguageALabel:YE}}', 'show', 'text', 'all', 'native', 210,
-        '80,1,350',
-        0,
-        '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100, '', 'no', '',
-        '', '',
-        '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none'),
+        '80,1,350', 0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100,
+        '', 'no', '', '', '', '{{SELECT IF("{{formLanguageAId:YE}}"="","hidden","show" ) }}', '', 'none'),
        (2, 'parameterLanguageB', 'Language: {{formLanguageBLabel:YE}}', 'show', 'text', 'all', 'native', 210,
-        '80,1,350',
-        0,
-        '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100, '', 'no', '',
-        '', '',
-        '{{SELECT IF("{{formLanguageBId:YE}}"="","hidden","show" ) }}', '', 'none'),
+        '80,1,350', 0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100,
+        '', 'no', '', '', '', '{{SELECT IF("{{formLanguageBId:YE}}"="","hidden","show" ) }}', '', 'none'),
        (2, 'parameterLanguageC', 'Language: {{formLanguageCLabel:YE}}', 'show', 'text', 'all', 'native', 210,
         '80,1,350',
-        0,
-        '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100, '', 'no', '',
-        '', '',
-        '{{SELECT IF("{{formLanguageCId:YE}}"="","hidden","show" ) }}', '', 'none'),
+        0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100, '', 'no',
+        '', '', '', '{{SELECT IF("{{formLanguageCId:YE}}"="","hidden","show" ) }}', '', 'none'),
        (2, 'parameterLanguageD', 'Language: {{formLanguageDLabel:YE}}', 'show', 'text', 'all', 'native', 210,
-        '80,1,350',
-        0,
-        '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100, '', 'no', '',
-        '', '',
-        '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none'),
+        '80,1,350', 0, '<a tabindex="-1" href="{{documentation:Y}}#multi-language-form">Info</a>', '', '', '', '', 100,
+        '', 'no', '', '', '', '{{SELECT IF("{{formLanguageDId:YE}}"="","hidden","show" ) }}', '', 'none'),
 
        (2, 'encode', 'Encode', 'show', 'radio', 'all', 'native', 300, 0, 0,
         '<a href="{{documentation:Y}}#field-encode">Info</a> {{SELECT IF(''{{encode:FRE:alnumx}}'' = ''specialchar'' AND ''{{checkType:FRE:alnumx}}'' = ''allbut'', "<br><span class=''text-danger''> <span class=''glyphicon glyphicon-warning-sign''></span> <span>Encode ''specialchar'' is not completely compatible with Check Type ''allbut'': certain user input will be converted to its HTML representation (e.g. &amp;quot;), which makes use of a non-supported character (&amp;)</span></span>", '''') }}',
-        '', '', '', 'buttonClass=btn-default',
-        101, '', 'yes', '', '', '', '', '', 'specialchar'),
+        '', '', '', 'buttonClass=btn-default', 101, '', 'yes', '', '', '', '', '', 'specialchar'),
 
 
        (2, 'checkType', 'Check Type', 'show', 'radio', 'all', 'native', 310, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-checktype">Info</a>', '', '', '', 'buttonClass=btn-default',
-        101, '', 'yes',
-        '',
-        '', '', '', '', 'specialchar'),
+        101, '', 'yes', '', '', '', '', '', 'specialchar'),
        (2, 'checkPattern', 'Check Pattern', 'show', 'text', 'all', 'native', 320, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-checkpattern">Info</a>, <a tabindex="-1" href="https://regex101.com/">Regex101</a>',
-        '',
-        '', '',
-        '', 101, '', 'yes', '', '', '',
+        '', '', '', '', 101, '', 'yes', '', '', '',
         '{{ SELECT IF("{{checkType:FRE:alnumx}}"="pattern" OR "{{checkType:FRE:allbut}}" LIKE "min%", "show", "hidden") }}',
         '', 'none'),
        #(2, 'onChange', 'JS onChange', 'show', 'text', 'all', 'native', 330, 0, 0, '', '', '', '', '', 101, '', 'no', '', '', '', '', '', 'none'),
@@ -441,66 +397,52 @@ VALUES (2, 'feIdContainer', 'Container', 'show', 'select', 'all', 'native', 120,
        #         '', '', '',
        #         'specialchar'),
        (2, 'adminNote', 'Internal Note', 'show', 'text', 'all', 'native', 360, '80,1,350', 0, '', '', '', '', '', 101,
-        '',
-        'no',
-        '', '',
-        '', '', '', 'specialchar'),
+        '', 'no', '', '', '', '', '', 'specialchar'),
 
        (2, 'labelAlign', 'Label Align', 'show', 'radio', 'all', 'native', 400, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#class-native">Info</a>', '', '', '', 'buttonClass=btn-default', 102,
-        '', 'no', '',
-        '',
-        '', '', '', 'specialchar'),
+        '', 'no', '', '', '', '', '', 'specialchar'),
        (2, 'size', 'Size', 'show', 'text', 'all', 'native', 405, 0, 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#field-size">Info</a>', '',
-        '', '', '', 102, '', 'no', '', '', '', '', '', 'specialchar'),
+        '<a tabindex="-1" href="{{documentation:Y}}#field-size">Info</a>', '', '', '', '', 102, '', 'no', '', '', '',
+        '', '', 'specialchar'),
        (2, 'bsLabelColumns', 'BS Label Columns', 'show', 'text', 'all', 'native', 410, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-bslabelcolumns">Info</a>', '', '', '', '', 102, '', 'no', '',
         '', '', '',
         '{{SELECT IF(f.bsLabelColumns != '''', f.bsLabelColumns, ''{{bsLabelColumns:Y}}'') FROM Form AS f WHERE f.id = {{formId}} }}',
         'specialchar'),
        (2, 'bsInputColumns', 'BS Input Columns', 'show', 'text', 'all', 'native', 420, 0, 0, '', '', '', '', '', 102,
-        '', 'no',
-        '', '', '', '',
+        '', 'no', '', '', '', '',
         '{{SELECT IF(f.bsInputColumns != '''', f.bsInputColumns, ''{{bsInputColumns:Y}}'') FROM Form AS f WHERE f.id = {{formId}} }}',
         'specialchar'),
        (2, 'bsNoteColumns', 'BS Note Columns', 'show', 'text', 'all', 'native', 430, 0, 0, '', '', '', '', '', 102, '',
-        'no',
-        '', '', '', '',
+        'no', '', '', '', '',
         '{{SELECT IF(f.bsNoteColumns != '''', f.bsNoteColumns, ''{{bsNoteColumns:Y}}'') FROM Form AS f WHERE f.id = {{formId}} }}',
         'specialchar'),
        (2, 'rowLabelInputNote', 'Label / Input / Note', 'show', 'checkbox', 'alnumx', 'native', 440, 0, 10,
         '<a tabindex="-1" href="{{documentation:Y}}#field-rowlabelinputnote">Info</a>', '', '', '', 'minWidth=72', 102,
-        '', 'no',
-        '', '', '', '',
-        '',
-        'specialchar'),
+        '', 'no', '', '', '', '', '', 'specialchar'),
        (2, 'maxLength', 'Maxlength', 'show', 'text', 'all', 'native', 450, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-maxlength">Info</a>', '', '', '', '', 102, '', 'no', '', '',
-        '', '', '',
-        'specialchar'),
+        '', '', '', 'specialchar'),
        (2, 'note', 'Note', 'show', 'text', 'all', 'native', 460, '80,1,350', 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-note">Info</a>', '', '', '', '', 102, '', 'no', '', '', '',
         '', '', 'none'),
        (2, 'tooltip', 'Tooltip', 'show', 'text', 'all', 'native', 470, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-tooltip">Info</a>', '', '', '', '', 102, '', 'no', '', '', '',
-        '', '',
-        'none'),
+        '', '', 'none'),
        (2, 'placeholder', 'Placeholder', 'show', 'text', 'all', 'native', 480, 0, 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-placeholder">Info</a>', '', '', '', '', 102, '', 'no', '', '',
-        '', '', '',
-        'none'),
+        '', '', '', 'none'),
 
        (2, 'value', 'value', 'show', 'text', 'all', 'native', 500, '80,1,350', 0,
         '<a tabindex="-1" href="{{documentation:Y}}#field-value">Info</a>', '', '', '', '', 103, '', 'no', '', '', '',
-        '', '',
-        'none'),
+        '', '', 'none'),
        (2, 'sql1', 'sql1', 'show', 'text', 'all', 'native', 510, '80,1,350', 0,
         '<a tabindex="-1" href="{{documentation:Y}}#sql1">Info</a><br><br>MariaDB: <a tabindex="-1" href="https://mariadb.com/kb/en/mariadb/select/">Select</a>, <a tabindex="-1" href="https://mariadb.com/kb/en/mariadb/functions-and-operators/">Functions</a>',
         '', '', '', '', 103, '', 'no', '', '', '', '', '', 'none'),
        (2, 'parameter', 'Parameter', 'show', 'text', 'all', 'native', 520, '80,1,350', 0,
-        '<a tabindex="-1" href="{{documentation:Y}}#fe-parameter-attributes">Info</a>',
-        '', '', '', '', 103, '', 'no', '', '', '', '', '', 'none');
+        '<a tabindex="-1" href="{{documentation:Y}}#fe-parameter-attributes">Info</a>', '', '', '', '', 103, '', 'no',
+        '', '', '', '', '', 'none');
 
 INSERT INTO `FormElement` (`id`, `formId`, `feIdContainer`, `dynamicUpdate`, `enabled`, `name`, `label`, `mode`,
                            `modeSql`, `class`, `type`, `subrecordOption`, `encode`, `checkType`, `checkPattern`,
@@ -510,8 +452,8 @@ INSERT INTO `FormElement` (`id`, `formId`, `feIdContainer`, `dynamicUpdate`, `en
                            `parameterLanguageD`, `clientJs`, `feGroup`, `deleted`)
 
 VALUES (NULL, '2', '0', 'no', 'yes', 'Check Name Conflict', '', 'show', '', 'action', 'beforeSave', '', 'specialchar',
-        'auto',
-        '', '', '650', '0', '', '', '', '', '', 'row,label,/label,input,/input,note,/note,/row', '', '', '', '', '', '',
+        'auto', '', '', '650', '0', '', '', '', '', '', 'row,label,/label,input,/input,note,/note,/row', '', '', '', '',
+        '', '',
         'sqlValidate={{!SELECT fe.id FROM FormElement AS fe WHERE "{{class:F:alnumx}}"=fe.class AND fe.formId={{formId:RF}} AND fe.name!="" AND fe.name="{{name:F:alnumx}}" AND fe.id!={{id:R0}} }}\r\n\r\nexpectRecords=0\r\n\r\nmessageFail=There is already another {{class:F:alnumx}} form element with name "{{name:F:alnumx}}".',
         '', '', '', '', '', '', 'no');
 
@@ -586,8 +528,7 @@ CREATE TABLE IF NOT EXISTS `Clipboard`
 # Form: CopyForm
 INSERT INTO Form (id, name, title, tableName, showButton, forwardMode, forwardPage, parameter)
 VALUES (3, 'copyForm', 'Copy a form', 'Clipboard', 'close,save', 'url-sip-skip-history',
-        '?id={{pageId:T}}&form=form&r={{formId:P0}}',
-        'submitButtonText = Copy Form');
+        '?id={{pageId:T}}&form=form&r={{formId:P0}}', 'submitButtonText = Copy Form');
 
 # FormElements: CopyForm
 INSERT INTO FormElement (formId, name, label, type, class, ord, sql1, parameter)
@@ -635,16 +576,14 @@ CREATE TABLE IF NOT EXISTS `Cron`
 
 # Form: AutoCron
 INSERT INTO Form (id, name, title, tableName, parameter, dirtyMode)
-VALUES (4, 'cron', 'autoCron', 'Cron', 'dbIndex={{indexQfq:Y}}',
-        'none');
+VALUES (4, 'cron', 'autoCron', 'Cron', 'dbIndex={{indexQfq:Y}}', 'none');
 
 # FormElements: AutoCron
 INSERT INTO FormElement (formId, name, label, mode, modeSql, type, encode, checkType, ord, parameter, size, note,
                          dynamicUpdate, bsLabelColumns, bsInputColumns, bsNoteColumns)
 VALUES (4, 'status', 'Enabled', 'show', '', 'checkbox', 'specialchar', 'alnumx', 10, '', '', '', 'no', '', '', ''),
        (4, 'type', 'Type', 'show', '', 'radio', 'specialchar', 'alnumx', 20, 'buttonClass=btn-default', '', '', 'yes',
-        '', '',
-        ''),
+        '', '', ''),
        (4, 'nextRun', 'Next run', 'show', '', 'text', 'specialchar', 'alnumx', 30,
         'extraButtonInfo = Cronjob will be started if specified timestamp is over. If timestamp=0: Job will never be started<br>Every time the jobs runs, this timestamp will be increased automatically by "frequency".',
         '', '', 'no', '', '', ''),
@@ -657,14 +596,12 @@ VALUES (4, 'status', 'Enabled', 'show', '', 'checkbox', 'specialchar', 'alnumx',
         'extraButtonInfo = Query: &#123;&#123;!SELECT ... as sendMailTo...&#125;&#125;<br><b>sendMailTo / sendMailCc / sendMailBcc</b>: Separate multiple by comma.<br><b>sendMailFrom</b><br><b>sendMailSubject</b><br><b>sendMailReplyTo</b>: Optional<br><b>sendMailFlagAutoSubmit</b>: Optional. on|off. Default on - if "on", suppresses OoO answers from receivers.<br><b>sendMailGrId</b>: Optional<br><b>sendMailXId</b>: Optional',
         '80,1,350', '', 'yes', '', '', ''),
        (4, 'content', '{{SELECT IF("{{type:FR:alnumx}}"="mail","Mail body","URL") }}', 'show', '', 'text', 'none',
-        'all', 70,
-        '', '80,1,350',
+        'all', 70, '', '80,1,350',
         'Website: URL absolute like "http://..." or relative like "?id=pagealias..."<br>Mail: Static Body or &#123;{SELECT ...&#125;}',
         'yes', '', '', ''),
 
        (4, 'outputFile', 'Log output to file', 'show', '{{SELECT IF("{{type:FR:alnumx}}"="mail","hidden","show") }}',
-        'text',
-        'none', 'all', 80, '', '', 'CWD: Site installation directory', 'yes', '', '', ''),
+        'text', 'none', 'all', 80, '', '', 'CWD: Site installation directory', 'yes', '', '', ''),
        (4, 'outputMode', 'Mode output', 'show', '{{SELECT IF("{{type:FR:alnumx}}"="mail","hidden","show") }}', 'radio',
         'specialchar', 'alnumx', 90, 'buttonClass=btn-default', '', '', 'yes', '', '', ''),
        (4, 'outputPattern', 'Pattern to look for on output', 'show',
@@ -674,9 +611,7 @@ VALUES (4, 'status', 'Enabled', 'show', '', 'checkbox', 'specialchar', 'alnumx',
 
        (4, 'lastRun', 'Last run', 'readonly', '', 'text', 'specialchar', 'alnumx', 120, '', '', '', 'no', '', '', ''),
        (4, 'lastStatus', 'Laststatus', 'readonly', '', 'text', 'specialchar', 'alnumx', 130, '', '80,1,350', '', 'no',
-        '3',
-        '9',
-        '0'),
+        '3', '9', '0'),
        (4, 'inProgress', 'In progress since', 'show', '', 'text', 'specialchar', 'alnumx', 140,
         'extraButtonInfo = Start time of a running job. When job is finished, this will be set back to 0. A new job will only be started, if this is 0. A progress duration >10mins will be treated as an error.',
         '', '', 'no', '', '', '');
-- 
GitLab


From 5224fd220d6507f1e1c0de0e5f426ac398060cc6 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 29 Feb 2020 14:28:05 +0100
Subject: [PATCH 43/48] Fix broken default value for Form.forwardMode

---
 extension/Classes/Sql/formEditor.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/Classes/Sql/formEditor.sql b/extension/Classes/Sql/formEditor.sql
index 6b7fdbcf..02bc26be 100644
--- a/extension/Classes/Sql/formEditor.sql
+++ b/extension/Classes/Sql/formEditor.sql
@@ -25,7 +25,7 @@ CREATE TABLE IF NOT EXISTS `Form`
     `multiDetailForm`          VARCHAR(255)                                                                               NOT NULL DEFAULT '',
     `multiDetailFormParameter` VARCHAR(255)                                                                               NOT NULL DEFAULT '',
 
-    `forwardMode`              ENUM ('auto', 'close', 'no', 'url', 'url-skip-history', 'url-sip', 'url-sip-skip-history') NOT NULL DEFAULT 'client',
+    `forwardMode`              ENUM ('auto', 'close', 'no', 'url', 'url-skip-history', 'url-sip', 'url-sip-skip-history') NOT NULL DEFAULT 'auto',
 
 
     `forwardPage`              VARCHAR(511)                                                                               NOT NULL DEFAULT '',
-- 
GitLab


From 2a97a37c805b558f75ad2724e5fbcb3295324e9a Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sat, 29 Feb 2020 20:59:40 +0100
Subject: [PATCH 44/48] Fixes #6798 - close didn't worked with r=0 - fixed now.

---
 extension/Classes/Core/QuickFormQuery.php | 30 +++++++----------------
 1 file changed, 9 insertions(+), 21 deletions(-)

diff --git a/extension/Classes/Core/QuickFormQuery.php b/extension/Classes/Core/QuickFormQuery.php
index be65b029..47106ce6 100644
--- a/extension/Classes/Core/QuickFormQuery.php
+++ b/extension/Classes/Core/QuickFormQuery.php
@@ -569,17 +569,16 @@ class QuickFormQuery {
                     break;
                 }
 
-                $customForward = $this->setForwardModePage();
+                $this->setForwardModePage();
 
                 // Logic: If a) r=0 and
-                //           b) User presses only 'save' (not save & close) and
-                //           c) there is no forwardMode=='url...'
+                //           b) final: (forwardMode=='auto' and User presses only 'save' (not 'save & close')) OR (forwardMode=='no')
                 // then the client should reload the current page with the newly created record. A new SIP is necessary!
                 $getJson = true;
-                if (0 == $this->store->getVar(SIP_RECORD_ID, STORE_SIP) &&
-                    API_SUBMIT_REASON_SAVE == $this->store->getVar(API_SUBMIT_REASON, STORE_CLIENT . STORE_EMPTY, SANITIZE_ALLOW_ALNUMX) &&
-                    $customForward == false
-                ) {
+                if (0 == $this->store->getVar(SIP_RECORD_ID, STORE_SIP)
+                    && (($this->formSpec[F_FORWARD_MODE] == F_FORWARD_MODE_AUTO
+                            && API_SUBMIT_REASON_SAVE == $this->store->getVar(API_SUBMIT_REASON, STORE_CLIENT . STORE_EMPTY, SANITIZE_ALLOW_ALNUMX)
+                        ) || $this->formSpec[F_FORWARD_MODE] == F_FORWARD_MODE_NO)) {
                     $this->formSpec = $this->buildNSetReloadUrl($this->formSpec, $rc);
                     $getJson = false;
                 }
@@ -788,12 +787,10 @@ class QuickFormQuery {
      *
      * '$this->formSpec[F_FORWARD_PAGE]':
      * a) url     http://www.nzz.ch/index.html?a=123#bottom, website.html?a=123#bottom,
-     *            ?[id=]<T3 Alias pageid>&a=123#bottom, ?id=<T3 page id>&a=123#bottom
+     *            ?[id=]<T3 Alias pageId>&a=123#bottom, ?id=<T3 pageId>&a=123#bottom
      * b) mode      no|client|url|...
      * c) mode|url  combination of above
      *
-     * @return bool  TRUE if F_FORWARD_MODE = 'url..', else FALSE
-     *
      * @throws \CodeException
      * @throws \DbException
      * @throws \UserFormException
@@ -802,7 +799,7 @@ class QuickFormQuery {
     private function setForwardModePage() {
 
         if (F_FORWARD_MODE_URL != substr($this->formSpec[F_FORWARD_MODE], 0, 3)) {
-            return false;
+            return;
         }
 
         $forwardPageTmp = $this->evaluate->parse($this->formSpec[F_FORWARD_PAGE]);
@@ -832,20 +829,11 @@ class QuickFormQuery {
                 break;
         }
 
-        if ('url' == substr($this->formSpec[F_FORWARD_MODE], 0, 3)) {
+        if (F_FORWARD_MODE_URL == substr($this->formSpec[F_FORWARD_MODE], 0, 3)) {
             if ($this->formSpec[F_FORWARD_PAGE] == '') {
                 $this->formSpec[F_FORWARD_MODE] = F_FORWARD_MODE_AUTO;
-                $customForward = false;
-            } else {
-                $customForward = true;
             }
-
-        } else {
-            $customForward = false;
         }
-
-        return $customForward;
-
     }
 
     /**
-- 
GitLab


From a40e347e34a8c33615f18121a0abb77e0a80a1d3 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 5 Apr 2020 10:10:51 +0200
Subject: [PATCH 45/48] Refs #10358 - qpdf, gs, pdfunite might be configured
 via QFQ config

---
 Makefile                                      |  1 +
 extension/Classes/Core/Constants.php          |  7 +++--
 extension/Classes/Core/Report/Download.php    | 27 ++++++++++++++++---
 extension/Classes/Core/Store/Config.php       |  7 +++--
 extension/Tests/Unit/Core/Store/StoreTest.php |  4 ++-
 extension/ext_conf_template.txt               |  9 +++++++
 6 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 89d85cbb..724d52b6 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@ plantuml:
 bootstrap: .npmpackages .plantuml_install .virtual_env
 	npm update
 	grunt default
+
 	# take care that phpOffice is located under 'qfq/Resources/Private/vendor/phpoffice'
 	# cd extension/Resources/Private; composer update
 	cd extension; composer update
diff --git a/extension/Classes/Core/Constants.php b/extension/Classes/Core/Constants.php
index ec8f54f3..88843e5e 100644
--- a/extension/Classes/Core/Constants.php
+++ b/extension/Classes/Core/Constants.php
@@ -644,10 +644,13 @@ const SYSTEM_ENTER_AS_SUBMIT = 'enterAsSubmit';
 const SYSTEM_SHOW_ID_IN_FORM_TITLE = 'showIdInFormTitle';
 
 const SYSTEM_CMD_WKHTMLTOPDF = 'cmdWkhtmltopdf';
-
-// Thumbnail
 const SYSTEM_CMD_INKSCAPE = 'cmdInkscape';
 const SYSTEM_CMD_CONVERT = 'cmdConvert';
+const SYSTEM_CMD_QPDF = 'cmdQpdf';
+const SYSTEM_CMD_GS = 'cmdGs';
+const SYSTEM_CMD_PDFUNITE = 'cmdPdfunite';
+
+// Thumbnail
 const SYSTEM_THUMBNAIL_DIR_SECURE = 'thumbnailDirSecure';
 const SYSTEM_THUMBNAIL_DIR_SECURE_DEFAULT = 'fileadmin/protected/qfqThumbnail';
 const SYSTEM_THUMBNAIL_DIR_PUBLIC = 'thumbnailDirPublic';
diff --git a/extension/Classes/Core/Report/Download.php b/extension/Classes/Core/Report/Download.php
index 41ba8511..0817ad7d 100644
--- a/extension/Classes/Core/Report/Download.php
+++ b/extension/Classes/Core/Report/Download.php
@@ -63,6 +63,21 @@ class Download {
      */
     private $downloadDebugLog = '';
 
+    /**
+     * @var string Name of command
+     */
+    private $qpdf = '';
+
+    /**
+     * @var string Name of command
+     */
+    private $gs = '';
+
+    /**
+     * @var string Name of command
+     */
+    private $pdfunite = '';
+
     /**
      * @var string DOWNLOAD_OUTPUT_FORMAT_RAW | DOWNLOAD_OUTPUT_FORMAT_JSON
      */
@@ -83,6 +98,10 @@ class Download {
         $this->db = new Database();
         $this->html2pdf = new Html2Pdf($this->store->getStore(STORE_SYSTEM), $phpUnit);
 
+        $this->qpdf = $this->store->getVar(SYSTEM_CMD_QPDF, STORE_SYSTEM);
+        $this->gs = $this->store->getVar(SYSTEM_CMD_GS, STORE_SYSTEM);
+        $this->pdfunite = $this->store->getVar(SYSTEM_CMD_PDFUNITE, STORE_SYSTEM);
+
         if (Support::findInSet(SYSTEM_SHOW_DEBUG_INFO_DOWNLOAD, $this->store->getVar(SYSTEM_SHOW_DEBUG_INFO, STORE_SYSTEM))) {
             $this->downloadDebugLog = $this->store->getVar(SYSTEM_SQL_LOG, STORE_SYSTEM);
         }
@@ -140,7 +159,7 @@ class Download {
 
 //        $cmd = "pdftk $inputFiles cat output $concatFile 2>&1";  # Outdated. Hard to install on Ubuntu 18. Fails for recent PDFs.
 //        $cmd = "qpdf --empty --pages $inputFiles -- $concatFile 2>&1"; # Fails to merge identical files, if they contain references.
-        $cmd = "pdfunite $inputFiles $concatFile 2>&1"; // Based on poppler. URLs are preserved. Orientation and size are preserved.
+        $cmd = $this->pdfunite . " $inputFiles $concatFile 2>&1"; // Based on poppler. URLs are preserved. Orientation and size are preserved.
 
         if ($this->downloadDebugLog != '') {
             Logger::logMessage("Download: $cmd", $this->downloadDebugLog);
@@ -188,7 +207,7 @@ class Download {
 
             // Possible output: "Unimplemented Feature: Could not merge encrypted files ('ct.18.06.092-097.pdf')"
             $line = implode(',', $rcOutput);
-            if (false !== ($line = strstr($line, "Unimplemented Feature: Could not merge encrypted files ("))) {
+            if (false !== ($line = strstr($line, "Feature not implemented: Could not merge encrypted files ("))) {
 
                 $arr = explode("'", $line, 3);
                 if (!empty($arr[1]) && file_exists($arr[1])) {
@@ -201,13 +220,13 @@ class Download {
                     }
 
                     // Try 1: via 'qpdf --decrypt'
-                    $cmdQpdf = "qpdf --decrypt '$backup' '$file' 2>&1"; // Try to decrypt file
+                    $cmdQpdf = $this->qpdf . " --decrypt '$backup' '$file' 2>&1"; // Try to decrypt file
                     exec($cmdQpdf, $outputQpdf, $rcQpdf);
 
                     if ($rcQpdf != 0) {
 
                         // Try 2: via 'gs -sDEVICE=pdfwrite'
-                        $cmdGs = "gs -sDEVICE=pdfwrite -dNOPAUSE -sOutputFile=\"$file\" -- \"$backup\"";
+                        $cmdGs = $this->gs . " -sDEVICE=pdfwrite -dNOPAUSE -sOutputFile=\"$file\" -- \"$backup\"";
                         exec($cmdGs, $outputGs, $rcGs);
 
                         if ($rcGs != 0) {
diff --git a/extension/Classes/Core/Store/Config.php b/extension/Classes/Core/Store/Config.php
index 95243d7b..29a638c9 100644
--- a/extension/Classes/Core/Store/Config.php
+++ b/extension/Classes/Core/Store/Config.php
@@ -324,8 +324,6 @@ class Config {
             F_BS_INPUT_COLUMNS => 'col-md-6 col-lg-6',
             F_BS_NOTE_COLUMNS => 'col-md-3 col-lg-3',
 
-            SYSTEM_CMD_WKHTMLTOPDF => '/opt/wkhtmltox/bin/wkhtmltopdf',
-
             F_CLASS => 'qfq-notify',
 
             F_CLASS_PILL => 'qfq-color-grey-1',
@@ -373,8 +371,13 @@ class Config {
             SYSTEM_DOCUMENTATION_QFQ => SYSTEM_DOCUMENTATION_QFQ_URL,
             SYSTEM_ENTER_AS_SUBMIT => 1,
 
+            SYSTEM_CMD_WKHTMLTOPDF => '/opt/wkhtmltox/bin/wkhtmltopdf',
             SYSTEM_CMD_INKSCAPE => 'inkscape',
             SYSTEM_CMD_CONVERT => 'convert',
+            SYSTEM_CMD_QPDF => 'qpdf',
+            SYSTEM_CMD_GS => 'gs',
+            SYSTEM_CMD_PDFUNITE => 'pdfunite',
+
             SYSTEM_THUMBNAIL_DIR_SECURE => SYSTEM_THUMBNAIL_DIR_SECURE_DEFAULT,
             SYSTEM_THUMBNAIL_DIR_PUBLIC => SYSTEM_THUMBNAIL_DIR_PUBLIC_DEFAULT,
 
diff --git a/extension/Tests/Unit/Core/Store/StoreTest.php b/extension/Tests/Unit/Core/Store/StoreTest.php
index e1105237..ec661206 100644
--- a/extension/Tests/Unit/Core/Store/StoreTest.php
+++ b/extension/Tests/Unit/Core/Store/StoreTest.php
@@ -410,7 +410,9 @@ class StoreTest extends TestCase {
             SYSTEM_SQL_LOG_MODE_AUTOCRON => 'error',
             F_CLASS => 'qfq-notify',
             SYSTEM_RENDER => SYSTEM_RENDER_SINGLE,
-
+            SYSTEM_CMD_QPDF => 'qpdf',
+            SYSTEM_CMD_GS => 'gs',
+            SYSTEM_CMD_PDFUNITE => 'pdfunite',
         ];
 
         $body = <<< EOT
diff --git a/extension/ext_conf_template.txt b/extension/ext_conf_template.txt
index 7d628905..071ff752 100644
--- a/extension/ext_conf_template.txt
+++ b/extension/ext_conf_template.txt
@@ -28,6 +28,15 @@ cmdConvert = convert
 # cat=config/config; type=string; label=Command 'wkhtmltopdf':Default is '/opt/wkhtmltox/bin/wkhtmltopdf'. Command to convert a HTML page to a PDF.
 cmdWkhtmltopdf = /opt/wkhtmltox/bin/wkhtmltopdf
 
+# cat=config/config; type=string; label=Command 'qpdf':Default is 'qpdf'. Will be used to convert PDF to PDF (try to repair) if merging of PDF fails.
+cmdQpdf = qpdf
+
+# cat=config/config; type=string; label=Command 'gs':Default is 'gs'. Will be used to decrypt and to convert PDF to PDF (try to repair) if merging of PDF fails.
+cmdGs = gs
+
+# cat=config/config; type=string; label=Command 'pdfunite':Default is 'pdfunite'. Will be used to merge PDFs.
+cmdPdfunite = pdfunite
+
 # cat=config/email; type=string; label=Options for SendEMail:Default is empty. General options. Check: http://caspian.dotconf.net/menu/Software/SendEmail. E.g.: 'sendEMail=-o tls=yes'
 sendEMailOptions =
 
-- 
GitLab


From 263274b1b52fd036666f07b659d01c7439f3d844 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 5 Apr 2020 14:01:39 +0200
Subject: [PATCH 46/48] Manual.rst: small update

---
 Documentation/Manual.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/Manual.rst b/Documentation/Manual.rst
index b9e14321..cdcbe50f 100644
--- a/Documentation/Manual.rst
+++ b/Documentation/Manual.rst
@@ -7029,7 +7029,7 @@ Column: _savePdf
 Generated PDFs can be stored directly on the server with this functionality. The link query consists of the following parameters:
 
 * One or more element sources (such as `F:`, `U:`, `p:`, see download-parameter-files_), including possible wkhtmltopdf parameters
-* The export filename and path as `d:` - for security reasons, this path has to start with *fileadmin/*
+* The export filename and path as `d:` - for security reasons, this path has to start with *fileadmin/* and end with *.pdf*.
 
 Tips:
 
-- 
GitLab


From 30b0a002124de7de884b1f81463da0a3cf8e1cba Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 5 Apr 2020 14:03:10 +0200
Subject: [PATCH 47/48] Revert change. Text change broke detection of failed
 pdfmerge - fixed

---
 extension/Classes/Core/Report/Download.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/Classes/Core/Report/Download.php b/extension/Classes/Core/Report/Download.php
index 0817ad7d..3820e521 100644
--- a/extension/Classes/Core/Report/Download.php
+++ b/extension/Classes/Core/Report/Download.php
@@ -207,7 +207,7 @@ class Download {
 
             // Possible output: "Unimplemented Feature: Could not merge encrypted files ('ct.18.06.092-097.pdf')"
             $line = implode(',', $rcOutput);
-            if (false !== ($line = strstr($line, "Feature not implemented: Could not merge encrypted files ("))) {
+            if (false !== ($line = strstr($line, "Unimplemented Feature: Could not merge encrypted files ("))) {
 
                 $arr = explode("'", $line, 3);
                 if (!empty($arr[1]) && file_exists($arr[1])) {
-- 
GitLab


From 67f6cc9ec0d07bc4aa1f87e6a6e549ab9b95e4e5 Mon Sep 17 00:00:00 2001
From: Carsten  Rose <carsten.rose@math.uzh.ch>
Date: Sun, 5 Apr 2020 14:06:57 +0200
Subject: [PATCH 48/48] Refs #9686 - filename sanitize is fine for browser
 download, but breaks with 'AS _savePdf'. New: 'slashes' again allowed.

---
 extension/Classes/Core/Report/Link.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/extension/Classes/Core/Report/Link.php b/extension/Classes/Core/Report/Link.php
index 8e6e0e04..1bafcc25 100644
--- a/extension/Classes/Core/Report/Link.php
+++ b/extension/Classes/Core/Report/Link.php
@@ -1529,8 +1529,8 @@ EOF;
         // By default, qfq saves everything HTML encoded. E.g. in form '&#39;' - decode them back to regual UTF-8 text.
         $filename = html_entity_decode($vars[DOWNLOAD_EXPORT_FILENAME], ENT_QUOTES | ENT_XML1, 'UTF-8');
 
-        // Remove unsafe characters.
-        $vars[DOWNLOAD_EXPORT_FILENAME] = Sanitize::safeFilename($filename);
+        // Remove unsafe characters. For '... AS _savePdf' slashes have to be allowed.
+        $vars[DOWNLOAD_EXPORT_FILENAME] = Sanitize::safeFilename($filename, false, true);
 
         return $vars;
     }
-- 
GitLab