feat(public-forms) Confirmation text should be easy to edit

issue #5838

public-forms/admin/public-forms/class_publicForm.inc

@@ -69,6 +69,11 @@ class publicForm extends simplePlugin
             'fdPublicFormTemplateDN', TRUE,
             array(), '', NULL
           ),
+          new TextAreaAttribute(
+            _('Confirmation text'), _('Text shown once the object is created'),
+            'fdPublicFormFinalText', FALSE,
+            'Success'
+          ),
         )
       ),
     );

public-forms/contrib/openldap/public-forms-fd.schema

@@ -34,9 +34,16 @@ attributetype ( 1.3.6.1.4.1.38414.67.10.4 NAME 'fdPublicFormTemplateDN'
   SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
   SINGLE-VALUE )
 
+attributetype ( 1.3.6.1.4.1.38414.67.10.5 NAME 'fdPublicFormFinalText'
+  DESC 'FusionDirectory - Final text of the public form, shown once the form is validated'
+  EQUALITY caseIgnoreMatch
+  SUBSTR caseIgnoreSubstringsMatch
+  SYNTAX 1.3.6.1.4.1.1466.115.121.1.15
+  SINGLE-VALUE )
+
 # Objectclasses
 
 objectclass ( 1.3.6.1.4.1.38414.67.2.1 NAME 'fdPublicForm'
   DESC 'FusionDirectory - Public form'
   MUST ( cn )
-  MAY ( fdPublicFormTitle $ fdPublicFormText $ fdPublicFormTemplateType $ fdPublicFormTemplateDN ) )
+  MAY ( fdPublicFormTitle $ fdPublicFormText $ fdPublicFormTemplateType $ fdPublicFormTemplateDN $ fdPublicFormFinalText ) )

public-forms/ihtml/themes/breezy/public-form.tpl

@@ -15,17 +15,27 @@
         </div>
         <div id="window-content">
           <div>
-            <p class="infotext">
-              {$form.fdPublicFormText|escape}
-            </p>
+            {if $done}
+              <p class="infotext">
+                {$form.fdPublicFormFinalText|escape}
+              </p>
+            {else}
+              <p class="infotext">
+                {$form.fdPublicFormText|escape}
+              </p>
 
-            <br/>
-            {$template_dialog}
+              <br/>
+              {$template_dialog}
+            {/if}
           </div>
         </div>
         {if !$done}
         <div id="window-footer" class="plugbottom">
-          <input type="submit" id="form_submit" name="form_submit" value="{msgPool type=okButton}"/>
+          <div>
+          </div>
+          <div>
+            <input type="submit" id="form_submit" name="form_submit" value="{msgPool type=okButton}"/>
+          </div>
         </div>
         {/if}
       </form>

public-forms/include/class_publicFormPage.inc

@@ -43,7 +43,20 @@ class publicFormPage extends standAlonePage
 
     if (!isset($this->form) && isset($_GET['form'])) {
       /* Search for the form object */
-      $forms = objects::ls('publicForm', array('dn' => 'raw', 'cn' => 1, 'fdPublicFormTitle' => 1, 'fdPublicFormText' => 1, 'fdPublicFormTemplateType' => 1, 'fdPublicFormTemplateDN' => 1), NULL, '(cn='.ldap_escape_f($_GET['form']).')');
+      $forms = objects::ls(
+        'publicForm',
+        array(
+          'dn'                        => 'raw',
+          'cn'                        => 1,
+          'fdPublicFormTitle'         => 1,
+          'fdPublicFormText'          => 1,
+          'fdPublicFormFinalText'     => 1,
+          'fdPublicFormTemplateType'  => 1,
+          'fdPublicFormTemplateDN'    => 1
+        ),
+        NULL,
+        '(cn='.ldap_escape_f($_GET['form']).')'
+      );
       if (count($forms) <= 0) {
         throw new FusionDirectoryException('Form "'.$_GET['form'].'" could not be found');
       } elseif (count($forms) > 1) {
@@ -81,9 +94,7 @@ class publicFormPage extends standAlonePage
 
     $this->assignSmartyVars();
 
-    if ($this->done) {
-      $smarty->assign('template_dialog', _('Object created successfully'));
-    } else {
+    if (!$this->done) {
       $templateOutput = $this->template->execute();
       if ($this->template->dialogOpened()) {
         //~ TODO

[Ghost User]

SonarQube analysis reported 1 issue

• 1 info

Note: The following issues were found on lines that were not modified in the commit. Because these issues can't be reported as line comments, they are summarized here:

1. Complete the task associated to this "TODO" comment.