Commit adfa6ebe authored by Elias Villiger's avatar Elias Villiger
Browse files

Merge branch 'master' into 5309-min-max-to-parameter-field

parents 693eb762 13079a52
......@@ -37,6 +37,39 @@ Bug Fixes
^^^^^^^^^
Version 0.25.11
---------------
Date: 31.01.2018
Notes
^^^^^
* Violating a sanitize class now returns '!!<sanitize class>!!' instead of an empty string.
Features
^^^^^^^^
* #5022 / Variable violates sanatize class: 'msg' instead of empty string - new identifier "!!<sanitize class>!!"
* #4813 / Exception during form load: show 'form edit link' if editor is logged in.
* formEditor.sql: Increas size of Form.title to give more room for SQL statements in.
* Manual.rst: enhance debug tipps.
* #5321 / Plain Link - render mode- only url - implemented
* Add regex101 link to checkPattern FormEditor
Bug Fixes
^^^^^^^^^
* Fixed some broken help links in formEditor.sql.
* #5306 / Exception: tt_content_uid wrong - fixed
* #4303 - Download von doc/docx-Dateien / Download.php - Mime type wird nicht mehr an Dateiname angehängt
* #5316 / Help on how to send an E-Mail is wrong - several places fixed.
* #5311 / Error Msg SLQ_RAW != SQL_FINAL: Debug message shows outdated SQL_RAW
* #5309 / min/max broken for date fields. Add min/max attributes to input and date input tag
* Fabric now detects 'dirty'
* Manual.rst: Remove broken link to W3C file upload.
Version 0.25.10
---------------
......@@ -94,7 +127,7 @@ Features
Bug Fixes
^^^^^^^^^
* Bug in sendeEmail: invalid SSL_version specified at /usr/share/perl5/IO/Socket/SSL.pm line 575. Patch for sendEmail (see https://unix.stackexchange.com/a/68952).
* Bug in sendEmail: invalid SSL_version specified at /usr/share/perl5/IO/Socket/SSL.pm line 575. Patch for sendEmail (see https://unix.stackexchange.com/a/68952).
Version 0.25.8
......
......@@ -47,8 +47,8 @@ Neue Versionsnummer
6) **New Tag**:
git tag v0.25.10
git push -u origin v0.25.10
git tag v0.25.11
git push -u origin v0.25.11
7) PhpStorm: **Sync** all files to VM qfq.
......
......@@ -3106,8 +3106,6 @@ Type: time
Type: upload
^^^^^^^^^^^^
* See: https://www.w3.org/TR/html5/forms.html#file-upload-state-(type=file)
An upload element is based on a 'file browse'-button and a 'trash'-button (=delete). Only one of them is shown at a time.
The 'file browse'-button is displayed, if there is no file uploaded already.
The 'trash'-button is displayed, if there is a file uploaded already.
......@@ -3225,9 +3223,8 @@ Requires: *'upload'-FormElement.name = 'column name'* of an column in the primar
After moving the file to `fileDestination`, the current record/column will be updated to `fileDestination`.
The database definition of the named column has to be a string variant (varchar, text but not numeric or else).
On form load, the column value will be displayed,
On form load, the column value will be displayed as the whole value (pathFileName)
* as the whole value (pathFileName)
Deleting an uploaded file in the form (by clicking on the trash near beside) will delete
the file on the filesystem as well. The column will be updated to an empty string.
......@@ -4835,7 +4832,7 @@ Column: _link
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Text |t:<text> |t:Firstname Lastname |- |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Render |r:<mode> |r:[0-5] |See: `render-mode`_, Default: 0 |
| | |Render |r:<mode> |r:3 |See: `render-mode`_, Default: 0 |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Button |b[:0|1|<btn class>] | b:0, b:1, b:success |'b', 'b:1': a bootstrap button is created. 'b:0' disable the button. <btn class>: default, primary, success, info, warning,danger |
+---+---+--------------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
......@@ -4889,21 +4886,25 @@ Column: _link
Render mode
^^^^^^^^^^^
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|Mode |Both: url & text |Only: url |Only: text|Description |
+===========+====================+===================+==========+===================================================================+
|0 (default)|<a href=url>text</a>|<a href=url>url</a>| |text or image will be shown, only if there is a url, page or mailto|
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|1 |<a href=url>text</a>|<a href=url>url</a>|text |Text or image will be shown, independet of there is a url |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|2 |<a href=url>text</a>| | |no link if text is empty |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|3 |text |url |text |no link, only text or image |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|4 |url |url |text |no link, show text, if text is empty, show url |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|5 | | | |nothing at all |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|Mode |Both: url & text |Only: url |Only: text|Description |
+===========+====================+===================+==========+=======================================================================+
|0 (default)|<a href=url>text</a>|<a href=url>url</a>| |text or image will be shown, only if there is a url, page or mailto |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|1 |<a href=url>text</a>|<a href=url>url</a>|text |Text or image will be shown, independet of there is a url |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|2 |<a href=url>text</a>| | |no link if text is empty |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|3 |text |url |text |no link, only text or image, incl. optional tooltip |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|4 |url |url |text |no link, show text, if text is empty, show url, incl. optional tooltip |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|5 | | | |nothing at all |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|6 | pure text | |pure text |no link, pure text |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
|7 | pure url |pure url | |no link, pure url |
+-----------+--------------------+-------------------+----------+-----------------------------------------------------------------------+
Link Examples
......@@ -5286,27 +5287,27 @@ The colum name is composed of the string *page* and a trailing character to spec
* Optional set of predefined icons.
* Optional set of dialog boxes.
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
| Parameter | Description | Default value |Example |
+=============+=================================================================================================+==========================================================+===============================================================+
|<page> |TYPO3 page id or page alias. |The current page: *{{pageId}}* |45 application application&N_param1=1045 |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<text> |Text, wrapped by the link. If there is an icon, text will be displayed to the right of it. |empty string | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<tooltip> |Text to appear as a ToolTip |empty string | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<question> |If there is a question text given, an alert will be opened. Only if the user clicks on 'ok', |**Expected "=" to follow "see"** | |
| |the link will be called | | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<class> |CSS Class for the <a> tag | | |
| | | | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<target> |Parameter for HTML 'target='. F.e.: Opens a new window |empty |P |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<rendermode> |Show/render a link at all or not. See `render-mode`_ 0-5 | | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<create sip> |s | |'s': create a SIP |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
| Parameter | Description | Default value |Example |
+==============+=================================================================================================+==========================================================+===============================================================+
|<page> |TYPO3 page id or page alias. |The current page: *{{pageId}}* |45 application application&N_param1=1045 |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<text> |Text, wrapped by the link. If there is an icon, text will be displayed to the right of it. |empty string | |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<tooltip> |Text to appear as a ToolTip |empty string | |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<question> |If there is a question text given, an alert will be opened. Only if the user clicks on 'ok', |**Expected "=" to follow "see"** | |
| |the link will be called | | |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<class> |CSS Class for the <a> tag | | |
| | | | |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<target> |Parameter for HTML 'target='. F.e.: Opens a new window |empty |P |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<render mode> |Show/render a link at all or not. See `render-mode`_ | | |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<create sip> |s | |'s': create a SIP |
+--------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
.. _column_paged:
......
......@@ -37,6 +37,39 @@ Bug Fixes
^^^^^^^^^
Version 0.25.11
---------------
Date: 31.01.2018
Notes
^^^^^
* Violating a sanitize class now returns '!!<sanitize class>!!' instead of an empty string.
Features
^^^^^^^^
* #5022 / Variable violates sanatize class: 'msg' instead of empty string - new identifier "!!<sanitize class>!!"
* #4813 / Exception during form load: show 'form edit link' if editor is logged in.
* formEditor.sql: Increas size of Form.title to give more room for SQL statements in.
* Manual.rst: enhance debug tipps.
* #5321 / Plain Link - render mode- only url - implemented
* Add regex101 link to checkPattern FormEditor
Bug Fixes
^^^^^^^^^
* Fixed some broken help links in formEditor.sql.
* #5306 / Exception: tt_content_uid wrong - fixed
* #4303 - Download von doc/docx-Dateien / Download.php - Mime type wird nicht mehr an Dateiname angehängt
* #5316 / Help on how to send an E-Mail is wrong - several places fixed.
* #5311 / Error Msg SLQ_RAW != SQL_FINAL: Debug message shows outdated SQL_RAW
* #5309 / min/max broken for date fields. Add min/max attributes to input and date input tag
* Fabric now detects 'dirty'
* Manual.rst: Remove broken link to W3C file upload.
Version 0.25.10
---------------
......
......@@ -3,7 +3,7 @@
project = QFQ - Quick Form Query
version = 0.25
release = 0.25.10
release = 0.25.11
t3author = Carsten Rose
copyright = since 2017 by the author
......
......@@ -59,7 +59,7 @@ copyright = u'2017, Carsten Rose'
# The short X.Y version.
version = '0.25'
# The full version, including alpha/beta/rc tags.
release = '0.25.10'
release = '0.25.11'
# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
......
......@@ -37,6 +37,39 @@ Bug Fixes
^^^^^^^^^
Version 0.25.11
---------------
Date: 31.01.2018
Notes
^^^^^
* Violating a sanitize class now returns '!!<sanitize class>!!' instead of an empty string.
Features
^^^^^^^^
* #5022 / Variable violates sanatize class: 'msg' instead of empty string - new identifier "!!<sanitize class>!!"
* #4813 / Exception during form load: show 'form edit link' if editor is logged in.
* formEditor.sql: Increas size of Form.title to give more room for SQL statements in.
* Manual.rst: enhance debug tipps.
* #5321 / Plain Link - render mode- only url - implemented
* Add regex101 link to checkPattern FormEditor
Bug Fixes
^^^^^^^^^
* Fixed some broken help links in formEditor.sql.
* #5306 / Exception: tt_content_uid wrong - fixed
* #4303 - Download von doc/docx-Dateien / Download.php - Mime type wird nicht mehr an Dateiname angehängt
* #5316 / Help on how to send an E-Mail is wrong - several places fixed.
* #5311 / Error Msg SLQ_RAW != SQL_FINAL: Debug message shows outdated SQL_RAW
* #5309 / min/max broken for date fields. Add min/max attributes to input and date input tag
* Fabric now detects 'dirty'
* Manual.rst: Remove broken link to W3C file upload.
Version 0.25.10
---------------
......@@ -94,7 +127,7 @@ Features
Bug Fixes
^^^^^^^^^
* Bug in sendeEmail: invalid SSL_version specified at /usr/share/perl5/IO/Socket/SSL.pm line 575. Patch for sendEmail (see https://unix.stackexchange.com/a/68952).
* Bug in sendEmail: invalid SSL_version specified at /usr/share/perl5/IO/Socket/SSL.pm line 575. Patch for sendEmail (see https://unix.stackexchange.com/a/68952).
Version 0.25.8
......
......@@ -10,6 +10,6 @@ $EM_CONF[$_EXTKEY] = array(
'dependencies' => 'fluid,extbase',
'clearcacheonload' => true,
'state' => 'alpha',
'version' => '0.25.10'
'version' => '0.25.11'
);
......@@ -240,10 +240,12 @@ class Link {
/*
* mode:
* 0: no output
* 1: text
* 2: url
* 1: <span title='...'>text</span> (no href)
* 2: <span title='...'>url</span> (no href)
* 3: <a href=url>url</a>
* 4: <a href=url>Text</a>
* 5: text
* 6: url
*
* r=render mode, u=url, t:text and/or image.
*
......@@ -280,6 +282,16 @@ class Link {
$this->renderControl[5][1][0] = 0;
$this->renderControl[5][1][1] = 0;
$this->renderControl[6][0][0] = 0;
$this->renderControl[6][0][1] = 5;
$this->renderControl[6][1][0] = 0;
$this->renderControl[6][1][1] = 5;
$this->renderControl[7][0][0] = 0;
$this->renderControl[7][0][1] = 0;
$this->renderControl[7][1][0] = 6;
$this->renderControl[7][1][1] = 6;
}
/**
......@@ -320,6 +332,7 @@ class Link {
public function renderLink($str) {
$tokenGiven = array();
$link = "";
if (empty($str)) {
return '';
......@@ -333,16 +346,14 @@ class Link {
$this->store->setVar(SYSTEM_DOWNLOAD_POPUP, DOWNLOAD_POPUP_REQUEST, STORE_SYSTEM);
}
$link = '';
// 0-4 URL, plain email
// 0-6 URL, plain email
// 10-14 encrypted email
// 20-24 delete / ajax
switch ($mode) {
// 0: No Output
case '0':
case '10':
case '20':
$link = "";
break;
// 1: 'text'
......@@ -386,6 +397,7 @@ class Link {
$link = Support::wrapTag($vars[FINAL_ANCHOR], $vars[FINAL_CONTENT]);
// $link = $this->encryptMailtoJS($vars, true);
break;
case '21':
case '22':
case '23':
......@@ -394,6 +406,27 @@ class Link {
$link = "<a href=\"javascript: void(0);\" onClick=\"var del = new FR.Delete({recordId:'',sip:'',forward:'" .
$vars[NAME_PAGE] . "'});\" " . $vars[NAME_LINK_CLASS] . ">" . $vars[NAME_TEXT] . "</a>";
break;
// 5: plain text, no <span> around
case '5':
$link = $vars[NAME_TEXT];
break;
case '15':
case '25':
throw new UserReportException ("Mode not implemented. internal render mode=$mode", ERROR_UNKNOWN_MODE);
// 6: plain url, no <span> around
case '6':
$link = $vars[FINAL_HREF];
break;
case '16':
case '26':
throw new UserReportException ("Mode not implemented. internal render mode=$mode", ERROR_UNKNOWN_MODE);
break;
default:
throw new UserReportException ("Mode not implemented. internal render mode=$mode", ERROR_UNKNOWN_MODE);
}
return $link;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment