diff --git a/extension/Documentation/Manual.rst b/extension/Documentation/Manual.rst
index a78102d923b687ee73796d8cb85e9b34793fa9a1..a2b1239915266b8b8203118a4c85d62b552aebd6 100644
--- a/extension/Documentation/Manual.rst
+++ b/extension/Documentation/Manual.rst
@@ -321,16 +321,17 @@ Extension Manager: QFQ Configuration
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| Debug |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
-| sqlLogMode | modify | *all*: every statement will be logged - this might a lot. |
-| | | *modify*: log only statements who change data. *error*: log only DB errors.|
-| | | *none*: no SQL log at all. |
+| sqlLogMode | modify | | *all*: every statement will be logged - this might a lot. |
+| | | | *modify*: log only statements who change data. *error*: log only |
+| | | DB errors. |
+| | | | *none*: no SQL log at all. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| sqlLog | fileadmin/protected/log/sql.log | Filename to log SQL commands: relative to <site path> or absolute. If the |
| | | directory does not exist, create it. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
-| formSubmitLogMode | all | *all*: every form submission will be logged. |
-| | | *none*: no logging. |
-| | | See `Form Submit Log page`_ for example qfq code to display the log. |
+| formSubmitLogMode | all | | *all*: every form submission will be logged. |
+| | | | *none*: no logging. |
+| | | | See `Form Submit Log page`_ for example qfq code to display the log. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| mailLog | fileadmin/protected/log/mail.log | Filename to log `sendEmail` commands: relative to <site path> or absolute. |
| | | If the directory does not exist, create it. |
@@ -344,10 +345,10 @@ Extension Manager: QFQ Configuration
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| dbInit | dbInit=set names utf8 | Global init for using the database. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
-| update | auto | 'auto': apply DB Updates only if there is a newer version. |
-| | | 'always': apply DB Updates always, especially play formEditor.sql every |
-| | | time QFQ is called - *not* recommended! |
-| | | 'never': never apply DB Updates. |
+| update | auto | | *auto*: apply DB Updates only if there is a newer version. |
+| | | | *always*: apply DB Updates always, especially play formEditor.sql every |
+| | | time QFQ is called - *not* recommended! |
+| | | | *never*: never apply DB Updates. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| indexData | 1 | Optional. Default: 1. Retrieve the current setting via {{_dbNameData:Y}}. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
@@ -385,8 +386,8 @@ Extension Manager: QFQ Configuration
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| Form-Layout |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
-| cssClassQfqContainer | container | QFQ with own Bootstrap: 'container'. |
-| | | QFQ already nested in Bootstrap of mainpage: <empty>. |
+| cssClassQfqContainer | container | | QFQ with own Bootstrap: 'container'. |
+| | | | QFQ already nested in Bootstrap of mainpage: <empty>. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| cssClassQfqForm | qfq-color-base | Wrap around QFQ 'Form'. |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
@@ -465,8 +466,11 @@ config.qfq.php
| Keyword | Example | Description |
+===============================+=======================================================+============================================================================+
| DB_<n>_USER | DB_1_USER=qfqUser | Credentials configured in MySQL |
++-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| DB_<n>_PASSWORD | DB_1_PASSWORD=1234567890 | Credentials configured in MySQL |
++-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| DB_<n>_SERVER | DB_1_SERVER=localhost | Hostname of MySQL Server |
++-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| DB_<n>_NAME | DB_1_NAME=qfq_db | Database name |
+-------------------------------+-------------------------------------------------------+----------------------------------------------------------------------------+
| LDAP_1_RDN | LDAP_1_RDN='ou=Admin,ou=example,dc=com' | Credentials for non-anonymous LDAP access. At the moment only one set of |
@@ -675,14 +679,14 @@ QFQ Keywords (Bodytext)
+-------------------+---------------------------------------------------------------------------------+
| Name | Explanation |
+===================+=================================================================================+
- | form | Formname defined in ttcontent record bodytext |
- | | - Fix. E.g.: **form = person** |
- | | - by SIP: **form = {{form:SE}}** |
- | | - by SQL: **form = {{SELECT c.form FROM conference AS c WHERE c.id={{a:C}} }}** |
+ | form | | Formname defined in ttcontent record bodytext |
+ | | | Fix. E.g.: **form = person** |
+ | | | - by SIP: **form = {{form:SE}}** |
+ | | | - by SQL: **form = {{SELECT c.form FROM config AS c WHERE c.id={{a:C}} }}** |
+-------------------+---------------------------------------------------------------------------------+
- | r | <record id> The form will load the record with the specified id |
- | | - Variants: **r = 123**, by SQL: **r = {{SELECT ...}}** |
- | | - If not specified, the default is '0' |
+ | r | | <record id> The form will load the record with the specified id |
+ | | | - Variants: **r = 123**, by SQL: **r = {{SELECT ...}}** |
+ | | | - If not specified, the default is '0' |
+-------------------+---------------------------------------------------------------------------------+
| <level>.db | Select a DB. Only necessary if a different than the standard DB should be used. |
+-------------------+---------------------------------------------------------------------------------+
@@ -719,8 +723,9 @@ QFQ Keywords (Bodytext)
| <level>.altsql | If <level>.sql is empty, these query will be fired. No sub queries. |
| | Shown after `althead` |
+-------------------+---------------------------------------------------------------------------------+
- | <level>.content | hide: content of current and sub levels are stored and not copied to output. |
- | | store: content of current and sub levels are stored. |
+ | <level>.content | | show (default): content of current and sub level are directly shown. |
+ | | | hide: content of current and sub levels are stored and not shown. |
+ | | | store: content of current and sub levels are stored and shown. |
+-------------------+---------------------------------------------------------------------------------+
| debugShowBodyText | If='1' and configuration_:*showDebugInfo: yes*, shows a tooltip with bodytext |
+-------------------+---------------------------------------------------------------------------------+
@@ -1607,10 +1612,9 @@ Store: *TYPO3* (Bodytext) - T
+-------------------------+-------------------------------------------------------------------+----------+
| Name | Explanation | Note |
+=========================+===================================================================+==========+
- | form | Formname defined in ttcontent record bodytext | see note |
- | | | |
- | | * Fix. E.g. *form = person* | |
- | | * via SIP. E.g. *form = {{form:SE}}* | |
+ | form | | Formname defined in ttcontent record bodytext | see note |
+ | | | * Fix. E.g. *form = person* | |
+ | | | * via SIP. E.g. *form = {{form:SE}}* | |
+-------------------------+-------------------------------------------------------------------+----------+
| pageId | Record id of current Typo3 page | see note |
+-------------------------+-------------------------------------------------------------------+----------+
@@ -2599,10 +2603,10 @@ Fields:
|Label | string | Label of *FormElement*. Depending on layout model, left or on top of the *FormElement* |
| | | Additional label description can be added by wrapping in HTML tag '<small>' |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
-|Mode | enum('show', 'readonly', | *Show*: regular user input field. This is the default. |
-| | 'required', | *Required*: User has to specify a value. Typically, an <empty string> represents 'no value'. |
-| | 'hidden' ) | *Readonly*: user can't change any data. Data not saved. |
-| | | *Hidden*: *FormElement* is not visible. |
+|Mode | enum('show', 'readonly', | | *Show*: regular user input field. This is the default. |
+| | 'required', | | *Required*: User has to specify a value. Typically, an <empty string> represents 'no value'. |
+| | 'hidden' ) | | *Readonly*: user can't change any data. Data not saved. |
+| | | | *Hidden*: *FormElement* is not visible. |
+---------------------+-----------------------------+-----------------------------------------------------------------------------------------------------+
|Mode sql | `SELECT` statement with | A value given here overwrites the setting from `mode`. Most useful with :ref:`dynamic-update`. |
| | a value like in `mode` | E.g.: {{SELECT IF( '{{otherFunding:FR:alnumx}}'='yes' ,'show', 'hidden' }} |
@@ -2808,112 +2812,6 @@ See also at specific *FormElement* definitions.
* `s/d/n`: string or date or number.
-
-Effect matrix
-^^^^^^^^^^^^^
-
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| Attribute | checkbox | dateJQW | datetimeJQW | gridJQW | extra | text | note | password | radio | select | subrecord | timeJQW | upload | editor |
-+=====================+==========+=========+=============+==========+========+=======+======+==========+=======+========+===========+=========+========+========+
-|id |Internal id |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|formId |Form | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|containerId |Assign the *FormElement* to user defined fieldSet or pill | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|enabled |*FormElement* is active or not | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|name |Name of a column of the primary table. *FormElements* with a corresponding table will be saved automatically. | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|label |Label shown to the user. | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|mode |show, readonly, required, lock, disable. | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|class |native | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|type | checkbox | dateJQW | datetimeJQW | gridJQW | extra | text | note | password | radio | select | subrecord | timeJQW | upload | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|checkType | | - | - | | | - | | - | | | | - | | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|checkPattern | | - | - | | | - | | - | | | | - | | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|onChange | - | - | - | | | - | | - | - | - | | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|ord | - | - | - | - | - | - | - | - | - | - | - | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|tabindex | - | - | - | - | - | - | - | - | - | - | - | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|size | - | | | | | - | | - | - | - 2 | | - | - ? | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|maxLength | 1 | | | | | - | | - | - 1 | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|note | - | - | - | | | - | - | - | - | - | - | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|tooltip | - | - | - | | | - | | - | - | - | | - | - | ? |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|placeholder | | - | - | | | - | | | | | | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|clientJs | | - | - | - | | - | | - | - | - | | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|value | - | - | - | - | - | - | - | - | - | - | | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|sql1 |? |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-|*Additional attributes in Field 'parameter'. Typically in key=value format.* |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| type | checkbox | dateJQW | datetimeJQW | gridJQW | extra | text | note | password | radio | select | subrecord | timeJQW | upload | editor |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| accept |? |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| alt |? | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| autocomplete | | - | - | | | - | | | | | | - | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| autofocus | - | - | - | | | - | | - | - | - | | - | - | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| checkBoxMode | - | - | | | | | | | | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| checked | - | | | | | - | | | - | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| unchecked | - | | | | | - | | | - | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| label2 | - | | | | | | | | - | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| itemList | - | | | | | | | | - | - | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| emptyItemAtStart | | | | | | | | | | - | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| emptyItemAtEnd | | | | | | | | | | - | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| emptyHide | | | | | | | | | | - | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| retype | | - | - | | | - | | - | | | | - | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| accept | | | | | | | | | | | | | - 3 | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| slaveId | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| fileDestination | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| sqlBefore | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| sqlInsert | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| sqlDelete | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| sqlAfter | | | | | | | | | | | | | - | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| extraButtonLock | | | | | | - | | - | | - | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| extraButtonPassword | | | | | | - | | | | | | | | |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-| extraButtonInfo | - | | | | | - | | - | - | - | | | | - |
-+---------------------+----------+---------+-------------+----------+--------+-------+------+----------+-------+--------+-----------+---------+--------+--------+
-
-* 1: A line break created every <size> elements. Easy way to make checkboxes or radio vertical instead of horizontal.
-* 2: Any number >1 makes the 'select' input 'multiple' ready.
-* 3: Accepted file mime types. See: https://www.w3.org/TR/html5/forms.html#file-upload-state-(type=file)
-
Native *FormElements*
'''''''''''''''''''''
* Like 'input', 'checkbox', ...
@@ -5593,8 +5491,8 @@ The colum name is composed of the string *page* and a trailing character to spec
+---------------+-----------------------------------------------+-------------------------------------+----------------------------------------------+
|_pagec |Internal link without a grafic, with question |*Please confirm!* |p:<pageId>[¶m] |
+---------------+-----------------------------------------------+-------------------------------------+----------------------------------------------+
-|_paged |Internal link with delete icon (trash) |*Delete record ?* |U:form=<formname>&r=<record id> *or* |
-| | | |U:table=<tablename>&r=<record id> |
+|_paged |Internal link with delete icon (trash) |*Delete record ?* | | U:form=<formname>&r=<record id> *or* |
+| | | | | U:table=<tablename>&r=<record id> |
+---------------+-----------------------------------------------+-------------------------------------+----------------------------------------------+
|_pagee |Internal link with edit icon (pencil) |empty |p:<pageId>[¶m] |
+---------------+-----------------------------------------------+-------------------------------------+----------------------------------------------+
@@ -5762,15 +5660,16 @@ Easily create Email links.
-+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+
-|**Parameter** |**Description** |**Default |
-| | |value** |
-+==============+==============================================================================================================================================================================================================+=============+
-|<emailaddress>|The email address where the link should point to. |none |
-+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+
-|<linktext> |The text that should be displayed on the website and be linked to the email address. This will typically be the name of the recipient. If this parameter is omitted, the email address will be displayed as |none |
-| |link text. | |
-+--------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+-------------+
++--------------+----------------------------------------------------------------------------------------+-------------+
+|**Parameter** |**Description** |**Default |
+| | |value** |
++==============+========================================================================================+=============+
+|<emailaddress>| The email address where the link should point to. |none |
++--------------+----------------------------------------------------------------------------------------+-------------+
+|<linktext> | The text that should be displayed on the website and be linked to the email address. |none |
+| | This will typically be the name of the recipient. If this parameter is omitted, | | | |
+| | the email address will be displayed as link text. | |
++--------------+----------------------------------------------------------------------------------------+-------------+
**Minimal Example**
@@ -5828,29 +5727,29 @@ Send emails. Every mail will be logged in the table `mailLog`. Attachments are s
|**Token** | **Parameter** |**Description** |**Required**|
| short / long | | | |
+==============+========================================+==================================================================================================+============+
-| f | email |**FROM**: Sender of the email. Optional: 'realname <john@doe.com>' | yes |
-| from | | | yes |
+| | f | email |**FROM**: Sender of the email. Optional: 'realname <john@doe.com>' | yes |
+| | from | | | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| t | email[,email] |**TO**: Comma separated list of receiver email addresses. Optional: `realname <john@doe.com>` | yes |
-| to | | | yes |
+| | t | email[,email] |**TO**: Comma separated list of receiver email addresses. Optional: `realname <john@doe.com>` | yes |
+| | to | | | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| c | email[,email] |**CC**: Comma separated list of receiver email addresses. Optional: 'realname <john@doe.com>' | |
-| cc | | | yes |
+| | c | email[,email] |**CC**: Comma separated list of receiver email addresses. Optional: 'realname <john@doe.com>' | |
+| | cc | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| B | email[,email] |**BCC**: Comma separated list of receiver email addresses. Optional: 'realname <john@doe.com>' | |
-| bcc | | | yes |
+| | B | email[,email] |**BCC**: Comma separated list of receiver email addresses. Optional: 'realname <john@doe.com>' | |
+| | bcc | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| r | REPLY-TO:email |**Reply-to**: Email address to reply to (if different from sender) | |
-| reply-to | | | yes |
+| | r | REPLY-TO:email |**Reply-to**: Email address to reply to (if different from sender) | |
+| | reply-to | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| s | Subject |**Subject**: Subject of the email | yes |
-| subject | | | yes |
+| | s | Subject |**Subject**: Subject of the email | yes |
+| | subject | | | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| b | Body |**Body**: Message - see also: `html-formatting`_ | yes |
-| body | | | yes |
+| | b | Body |**Body**: Message - see also: `html-formatting`_ | yes |
+| | body | | | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| h | Mail header |**Custom mail header**: Separate multiple header with \\r\\n | |
-| header | | | yes |
+| | h | Mail header |**Custom mail header**: Separate multiple header with \\r\\n | |
+| | header | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
| F | Attach file |**Attachment**: File to attach to the mail. Repeatable. | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
@@ -5863,20 +5762,20 @@ Send emails. Every mail will be logged in the table `mailLog`. Attachments are s
| C | Concat multiple F|p|u| together |**Attachment**: All following (until the next 'C') 'F|p|u' concatenated to one attachment. | |
| | | Repeatable. | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| A | flagAutoSubmit 'on' / 'off' |If 'on' (default), add mail header 'Auto-Submitted: auto-send' - suppress OoO replies | |
-| autosubmit | | | yes |
+| | A | flagAutoSubmit 'on' / 'off' |If 'on' (default), add mail header 'Auto-Submitted: auto-send' - suppress OoO replies | |
+| | autosubmit | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| g | grId |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
-| grid | | | yes |
+| | g | grId |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
+| | grid | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| x | xId |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
-| xid | | | yes |
+| | x | xId |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
+| | xid | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| y | xId2 |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
-| xid2 | | | yes |
+| | y | xId2 |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
+| | xid2 | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
-| z | xId3 |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
-| xid3 | | | yes |
+| | z | xId3 |Will be copied to the mailLog record. Helps to setup specific logfile queries | |
+| | xid3 | | | yes |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
| e | encode|decode|none |**Subject**: will be htmlspecialchar() encoded, decoded (default) or none (untouched) | |
+--------------+----------------------------------------+--------------------------------------------------------------------------------------------------+------------+
diff --git a/extension/qfq/qfq/Constants.php b/extension/qfq/qfq/Constants.php
index e1003539ecd4a1cd0224114a240812764faaa066..7577cf0a3dc1d41c14bf29279ab439a41768f3c8 100644
--- a/extension/qfq/qfq/Constants.php
+++ b/extension/qfq/qfq/Constants.php
@@ -1300,6 +1300,7 @@ const TOKEN_COLUMN_CTRL = '_';
const TOKEN_CONTENT_STORE = 'store';
const TOKEN_CONTENT_HIDE = 'hide';
+const TOKEN_CONTENT_SHOW = 'show';
//Report: Column Token
const COLUMN_LINK = 'link';
diff --git a/extension/qfq/qfq/report/Report.php b/extension/qfq/qfq/report/Report.php
index d5536a0c8b99ad1bbfbd68f473acafa1b352b243..c18a4a4857784944ff0ab679f47ba2046fd90b82 100644
--- a/extension/qfq/qfq/report/Report.php
+++ b/extension/qfq/qfq/report/Report.php
@@ -589,6 +589,7 @@ class Report {
case TOKEN_CONTENT_STORE:
$this->variables->resultArray[$fullLevel . ".line."][TOKEN_CONTENT] = $contentLevel;
break;
+ case TOKEN_CONTENT_SHOW:
case '':
break;
@@ -605,7 +606,6 @@ class Report {
} else {
$fullLevel = '';
}
-
}
return $content;