Skip to content

GitLab

Commit f8d340e7 authored by Carsten Rose's avatar Carsten Rose
Browse files

Documentation/UsersManual/index.rst: fixed various Link details 

Link.php: Whole class refactored. Errors now reported via UserReportExtension. Access to array 'vars[]' now unified via constants. Number of build*() Functions reduced. Handling of default values simplified.
parent 86772416
Expand all Hide whitespace changes
Inline Side-by-side
extension/Documentation/UsersManual/Index.rst
View file @ f8d340e7
......@@ -1178,13 +1178,13 @@ Column: link
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
|x | |Mail |m:<email> |m:info@example.com |Default link class: email |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
|x | |Page |p:<pageId> |p:impressum |'?' is prepended, no hostname qualifier (will be set automatically by the browser), default link class: internal |
|x | |Page |p:<pageId> |p:impressum |Prepend '?' or '?id=', no hostname qualifier (automatically set by browser), default link class: internal, default value: {{pageId}} |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Text |t:<text> |t:Firstname Lastname |- |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Render |r:<mode> |r:[0-5] |Rendering mode: see below. Default: 0 |
| | |Render |r:<mode> |r:[0-5] |`render-mode`_ Default: 0 |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| |x |Picture |P:<filename> |P:bullet-red.gif |Picture '<imgsrc="bullet-red.gif"alt="....">', default link class: internal. |
| |x |Picture |P:<filename> |P:bullet-red.gif |Picture '<img src="bullet-red.gif"alt="....">', default link class: internal. |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| |x |Edit |E |E |Show 'edit' icon as image |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
......@@ -1212,7 +1212,7 @@ Column: link
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Target |g:<text> |g:_blank |target=_blank, Default: no target |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Question |q:<text> |q:please confirm |Link will be executed only if user clicks ok |
| | |Question |q:<text> |q:please confirm |Link will be executed only if user clicks ok, default: 'Please confirm' |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
| | |Encryption|e:0|1|... |e:1 |Encryption of the e-mail: 0: no encryption, 1:via Javascript (default) |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
......@@ -1221,7 +1221,10 @@ Column: link
| | |Hash |h |h |A hash entry is generated with all Parameters. No other URL parameter than 'S_hash' (=hash) |
+---+---+----------+-----------------------------------+---------------------------+----------------------------------------------------------------------------------------------------------------------------------------+
**Render mode**
.. _render-mode:
Render mode
^^^^^^^^^^^
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|Mode |Both: url & text |Only: url |Only: text|Description |
......@@ -1234,7 +1237,7 @@ Column: link
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|3 |text |url |text |no link, only text or image |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|4 |url |url |url |no link, show text, if text is empty, show url |
|4 |url |url |text |no link, show text, if text is empty, show url |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
|5 | | | |nothing at all |
+-----------+--------------------+-------------------+----------+-------------------------------------------------------------------+
......@@ -1356,8 +1359,7 @@ below.
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<target> |Parameter for HTML 'target='. F.e.: Opens a new window |empty |P |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<rendermode> |Easy way not to show/render a link at all. Render modes (0-5) are defined in table **Render |0 |5 |
| |mode** in section `column-link`_ | | |
|<rendermode> |Easy way (not) to show/render a link at all. See `render-mode`_ 0-5 | | |
+-------------+-------------------------------------------------------------------------------------------------+----------------------------------------------------------+---------------------------------------------------------------+
|<createhash> |h |see below |'h': create a hash, 'H': create no hash. Specify only if |
| | | |default is not suitable |
......
extension/qfq/qfq/Constants.php
View file @ f8d340e7
......@@ -137,6 +137,10 @@ const ERROR_IO_OPEN = 1204;
//Report
const ERROR_UNKNOWN_LINK_QUALIFIER = 1300;
const ERROR_UNDEFINED_RENDER_CONTROL_COMBINATION = 1301;
const ERROR_MISSING_VALUE = 1302;
const ERROR_MULTIPLE_DEFINITION = 1303;
const ERROR_MULTIPLE_URL_PAGE_MAILTO_DEFINITION = 1304;
// KeyValueParser
const ERROR_KVP_VALUE_HAS_NO_KEY = 1900;
......
extension/qfq/qfq/report/Link.php
View file @ f8d340e7
This diff is collapsed.
extension/qfq/tests/phpunit/LinkTest.php
View file @ f8d340e7
This diff is collapsed.
t3/qfq.php
View file @ f8d340e7
......@@ -36,7 +36,7 @@ function renderForm($bodytext = "") {
echo "test";
} catch (UserException $e) {
} catch (UserFormException $e) {
echo $e->formatMessage();
} catch (CodeException $e) {
echo $e->formatMessage();
......
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