refactor(form): simplify code

Signed-off-by: Thierry Bugier <tbugier@teclib.com>
pluginsGLPI · Jul 24, 2020 · ca600d4 · ca600d4
1 parent 16fd205
commit ca600d4
Showing 1 changed file with 34 additions and 33 deletions.
diff --git a/front/form.form.php b/front/form.form.php
@@ -120,46 +120,47 @@
 
 } else if (isset($_POST['submit_formcreator'])) {
    // Save form to target
-   if ($form->getFromDB($_POST['plugin_formcreator_forms_id'])) {
+   if (!$form->getFromDB($_POST['plugin_formcreator_forms_id'])) {
+      Html::back();
+   }
 
-      // If user is not authenticated, create temporary user
-      if (!isset($_SESSION['glpiname'])) {
-         $_SESSION['glpiname'] = 'formcreator_temp_user';
-      }
+   // If user is not authenticated, create temporary user
+   if (!isset($_SESSION['glpiname'])) {
+      $_SESSION['glpiname'] = 'formcreator_temp_user';
+   }
 
-      // Save form
-      $formAnswer = new PluginFormcreatorFormAnswer();
-      if ($formAnswer->add($_POST) === false) {
-         Html::back();
-      }
-      $form->increaseUsageCount();
+   // Save form
+   $formAnswer = new PluginFormcreatorFormAnswer();
+   if ($formAnswer->add($_POST) === false) {
+      Html::back();
+   }
+   $form->increaseUsageCount();
 
-      if ($_SESSION['glpiname'] == 'formcreator_temp_user') {
-         // Form was saved by an annymous user
-         unset($_SESSION['glpiname']);
-         Html::redirect('formdisplay.php?answer_saved');
-      }
+   if ($_SESSION['glpiname'] == 'formcreator_temp_user') {
+      // Form was saved by an annymous user
+      unset($_SESSION['glpiname']);
+      Html::redirect('formdisplay.php?answer_saved');
+   }
 
-      // redirect to created item
-      if ($_SESSION['glpibackcreated']) {
-         if (count($formAnswer->targetList) == 1) {
-            $target = current($formAnswer->targetList);
-            Html::redirect($target->getFormURLWithID($target->getID()));
-         }
-         Html::redirect(PluginFormcreatorFormAnswer::getFormURLWithID($formAnswer->getID()));
+   // redirect to created item
+   if ($_SESSION['glpibackcreated']) {
+      if (count($formAnswer->targetList) == 1) {
+         $target = current($formAnswer->targetList);
+         Html::redirect($target->getFormURLWithID($target->getID()));
       }
+      Html::redirect(PluginFormcreatorFormAnswer::getFormURLWithID($formAnswer->getID()));
+   }
 
-      if (plugin_formcreator_replaceHelpdesk()) {
-         // Form was saved from the service catalog
-         Html::redirect('issue.php');
-      }
-      if (strpos($_SERVER['HTTP_REFERER'], 'formdisplay.php') !== false) {
-         // Form was saved from helpdesk (assistance > forms)
-         Html::redirect('formlist.php');
-      }
-      // Form was saved from preview tab, go back to the preview
-      Html::back();
+   if (plugin_formcreator_replaceHelpdesk()) {
+      // Form was saved from the service catalog
+      Html::redirect('issue.php');
+   }
+   if (strpos($_SERVER['HTTP_REFERER'], 'formdisplay.php') !== false) {
+      // Form was saved from helpdesk (assistance > forms)
+      Html::redirect('formlist.php');
    }
+   // Form was saved from preview tab, go back to the preview
+   Html::back();
 
 } else {
    // Show forms form