From e90ead06738a11b50f1fa3fd26061da91088968c Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Mon, 5 Mar 2018 16:08:14 +0000 Subject: [PATCH 1/4] XEP-0050. Try to clarify usage of 'execute' --- xep-0050.xml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xep-0050.xml b/xep-0050.xml index 1d553b22..9a086b16 100644 --- a/xep-0050.xml +++ b/xep-0050.xml @@ -526,17 +526,19 @@
  • If there is an <actions/> element, the user-agent usually uses a multi-stage dialog or view, such as a wizard.
  • Responders SHOULD use the following guidelines when providing <actions/>:

    From ed41edb80c0046da6df669e076809df69b31d75a Mon Sep 17 00:00:00 2001 From: Kevin Smith Date: Mon, 19 Mar 2018 11:25:25 +0000 Subject: [PATCH 2/4] Use Jonas's suggested wording --- xep-0050.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xep-0050.xml b/xep-0050.xml index 9a086b16..7bb9a372 100644 --- a/xep-0050.xml +++ b/xep-0050.xml @@ -526,7 +526,7 @@
  • If there is an <actions/> element, the user-agent usually uses a multi-stage dialog or view, such as a wizard.
      -
    • The action "execute" is always allowed, and is equivalent to the action "next". A form that has an <actions/> element, no "execute" attribute, and for which <next/> is not an available action is therefore invalid.
    • +
    • The action "execute" is equivalent to the action specified in the "execute" attribute. If the "execute" attribute is absent, it defaults to "next". A form which has an <actions/> element and an "execute" attribute which evaluates (taking the default into account if absent) to an action which is not allowed is therefore invalid.
    • The "prev" action is typically the "back" or "previous" button or option in a wizard. If <prev/> is not contained by the <actions/>, it is disabled.
    • The "next" action is typically the "next" button or option in a wizard. If <next/> is not contained by the <actions/>, it is disabled.
    • The "complete" action is typically the "finish" or "done" button or option in a wizard. If <complete/> is not contained by the <actions/>, it is disabled.
    • From fc14df1d8d49a065115cb4549e66e243db4b6ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Tue, 9 Jun 2020 17:48:18 +0200 Subject: [PATCH 3/4] Add a note that the execute action is discouraged --- xep-0050.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xep-0050.xml b/xep-0050.xml index 7bb9a372..65d8aeb1 100644 --- a/xep-0050.xml +++ b/xep-0050.xml @@ -370,6 +370,7 @@ ]]>

      The <command/> SHOULD include an <actions/> element, which specifies the details of what the allowed actions are for this stage of execution. Each element within <action/> matches a possible value for the <command/> element's "action" attribute. The "execute" attribute defines which of the included actions is considered the equivalent to "execute" for this stage. In the above example, the only allowed action is to progress to the next stage, which is also the default.

      +

      Note: The "execute" action (not the attribute) is ambiguous and may have undefined behaviour in some implementations. Relying on the specific behavior of the execute action is discouraged, especially in cases where the "complete" action is not allowed and the "execute" attribute is not specified (see also Command Actions.

      The requester then submits the form, maintaining the command node and sessionid:

      From 516a1ae3f234eba7f23b36228a1b9f2d005774d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= Date: Tue, 9 Jun 2020 17:49:10 +0200 Subject: [PATCH 4/4] XEP-0050: add revision block --- xep-0050.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/xep-0050.xml b/xep-0050.xml index 65d8aeb1..a2e38b93 100644 --- a/xep-0050.xml +++ b/xep-0050.xml @@ -25,6 +25,12 @@ http://www.xmpp.org/schemas/commands.xsd &linuxwolf; + + 1.3.0 + 2020-06-09 + kis + Clarify illegal uses of 'execute'. + 1.2.3 2019-03-26