Revert "Simplified the PHP controlling the forms to ensure there are no user facing errors."

This reverts commit 7f38a2e83b7cddbb457314432a121741c007bfb4.
Revert "Revert "Simplified the PHP controlling the forms to ensure there are no user facing errors.""

This reverts commit 6760b5268e59397c209947758aa37eca540c79a5.
Merge branch 'master' of https://github.com/brandonpweiss/XFR