From 6b07cf03fe52d16993f09636bc9e50e34633a266 Mon Sep 17 00:00:00 2001
From: Markus Birth <mbirth@gmail.com>
Date: Wed, 13 Jul 2016 20:34:19 +0200
Subject: [PATCH] Further compacting of code for future split up.

---
 index.php     | 47 +++++++++++++++++++----------------------------
 prep_form.php | 30 ------------------------------
 2 files changed, 19 insertions(+), 58 deletions(-)
 delete mode 100644 prep_form.php

diff --git a/index.php b/index.php
index 33852ee..bd3590c 100644
--- a/index.php
+++ b/index.php
@@ -121,35 +121,26 @@ if (!$tpl_done && isset($_SESSION['access_token']) && $_SESSION['access_token'])
                     echo 'Mail sending failed!!';
                 }
                 break;
-            case 'event':
-                $ho->setTemplate('event_html');
-                $tpl_done = true;
-                break;
-            case 'flight':
-                $ho->setTemplate('flight_html');
-                $tpl_done = true;
-                $action = 'flight';
-                require 'prep_form.php';
-                break;
-             case 'hotel':
-                $ho->setTemplate('hotel_html');
-                $tpl_done = true;
-                $action = 'hotel';
-                require 'prep_form.php';
-                break;
-            case 'restaurant':
-                $ho->setTemplate('restaurant_html');
-                $tpl_done = true;
-                $action = 'restaurant';
-                require 'prep_form.php';
-                break;
-            case 'rentalcar':
-                $ho->setTemplate('rentalcar_html');
-                $tpl_done = true;
-                $action = 'rentalcar';
-                require 'prep_form.php';
-                break;
             default:
+                if (in_array($action, array('event', 'flight', 'hotel', 'restaurant', 'rentalcar'))) {
+                    $ho->setTemplate($action . '_html');
+                    $tpl_done = true;
+                    $skey = 'form_' . $action;
+
+                    $placeholders = array(
+                        'USER_NAME'  => $data['user']['name_first'] . ' ' . $data['user']['name_last'],
+                        'USER_EMAIL' => $data['user']['email'],
+                    );
+                    $fd = new FieldDefinition($action);
+                    $fd->setPlaceholders($placeholders);
+                    $fd->setFieldValues($_SESSION[$skey]);
+
+                    $by_group = $fd->getGroups();
+
+                    // Convert hash to list for Mustache compatibility
+                    $by_group = array_values($by_group);
+                    $data['form_data'] = $by_group;
+                }
                 if (!$tpl_done) {
                     $ho->setTemplate('loggedin_html');
                     $tpl_done = true;
diff --git a/prep_form.php b/prep_form.php
deleted file mode 100644
index 86fdcfb..0000000
--- a/prep_form.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-
-use \Frs\FieldDefinition;
-
-// FOR TESTING:
-if (!isset($action)) {
-    $action = 'hotel';
-    $debug = true;
-}
-$skey   = 'form_' . $action;
-
-$fd = new FieldDefinition($action);
-
-$placeholders = array(
-    'USER_NAME'  => $data['user']['name_first'] . ' ' . $data['user']['name_last'],
-    'USER_EMAIL' => $data['user']['email'],
-);
-$fd->setPlaceholders($placeholders);
-$fd->setFieldValues($_SESSION[$skey]);
-
-$by_group = $fd->getGroups();
-
-// Convert hash to list for Mustache compatibility
-$by_group = array_values($by_group);
-
-if ($debug) {
-    print_r($by_group);
-}
-
-$data['form_data'] = $by_group;