diff --git a/index.php b/index.php index 95dbe80..bf6ead7 100644 --- a/index.php +++ b/index.php @@ -6,7 +6,7 @@ use \Frs\FieldDefinition; use \Frs\Output\HtmlOutput; use \Frs\Output\MailOutput; use \Frs\Output\Transport\StdoutTransport; -use \Frs\Output\Transport\GScriptTransport; +use \Frs\Output\Transport\NullTransport; $stdout = new StdoutTransport(); $ho = new HtmlOutput($stdout, dirname(__FILE__) . '/templates'); @@ -25,9 +25,7 @@ switch ($action) { break; case 'send': - echo 'This would send the mail...'; - $mt = new GScriptTransport(); - $mo = new MailOutput($mt, dirname(__FILE__) . '/templates'); + $mo = new MailOutput(new NullTransport(), dirname(__FILE__) . '/templates'); $form_type = $_REQUEST['form_type']; $mo->setTemplate('mail_' . $form_type); $fd = new FieldDefinition($form_type); @@ -41,13 +39,15 @@ switch ($action) { $mo->setTemplateVars($data); $mo->setTemplateVar('form_type', $form_type); $mo->setTemplateVar('form_type_uc', ucwords($form_type)); - $mo->setSubject('[FRS] ' . ucwords($form_type) . ' Reservation'); - $mail_sent = $mo->send(); - if ($mail_sent) { - $ho->setTemplate('mail_sent_html'); - } else { - $ho->setTemplate('mail_failed_html'); - } + $mo->setSubject('[FRS] ' . ucwords($form_type) . ' Reservation'); // default subject + $mail_html = $mo->getRenderedOutput(); // contains headers + body + list($headers, $mailbody) = preg_split('/\r?\n\r?\n/', $mail_html, 2); + $mo->setHeadersFromString($headers); // updates Subject line + + $ho->setTemplate('mail_prep_html'); + $ho->setTemplateVar('gscript_url', 'https://script.google.com/macros/s/AKfycbxVcugiTBTvWx8DK_HhuQh_vXdteir6GTXE_Anir3rfovatjQM/exec'); + $ho->setTemplateVar('mail_subject', $mo->getSubject()); + $ho->setTemplateVar('mail_body', $mailbody); break; case 'event': diff --git a/lib/Frs/Output/MailOutput.php b/lib/Frs/Output/MailOutput.php index 6ab8816..d038a3e 100644 --- a/lib/Frs/Output/MailOutput.php +++ b/lib/Frs/Output/MailOutput.php @@ -37,6 +37,16 @@ class MailOutput extends GenericOutput $this->subject = $newSubject; } + /** + * Gets the currently set subject for the mail. + * + * @return string Subject currently set. + */ + public function getSubject() + { + return $this->subject; + } + /** * Sets the given header $key to $value. A Subject: header sets * the subject via $this->setSubject(). A To: header is ignored. diff --git a/lib/Frs/Output/Transport/GScriptTransport.php b/lib/Frs/Output/Transport/GScriptTransport.php deleted file mode 100644 index 7c46932..0000000 --- a/lib/Frs/Output/Transport/GScriptTransport.php +++ /dev/null @@ -1,47 +0,0 @@ -post_url = 'https://script.google.com/macros/s/AKfycbxVcugiTBTvWx8DK_HhuQh_vXdteir6GTXE_Anir3rfovatjQM/exec'; - } - - public function setParam($key, $value) - { - switch ($key) { - case 'to': - // ignored - break; - - case 'subject': - $this->subject = $value; - break; - - case 'headers': - $this->headers = $value; - break; - } - } - - public function setContent($content) - { - $this->content = $content; - } - - public function transmit() - { - echo '
'; - echo ''; - echo ''; - echo ''; - echo '
'; - return true; - } -} diff --git a/lib/Frs/Output/Transport/NullTransport.php b/lib/Frs/Output/Transport/NullTransport.php new file mode 100644 index 0000000..d20f148 --- /dev/null +++ b/lib/Frs/Output/Transport/NullTransport.php @@ -0,0 +1,19 @@ + html_head}} +{{> mdl_head}} +{{> mdl_content_head}} + +
+ Fake Reservation System > Send Reservation +
+ +

Sending Mail

+ +

+This is what will be sent to your account: +

+ +

+

+ + +
+ + + Please input a value! +

+ +
+ + +

+ + +
+

+ +{{> mdl_content_foot}} +{{> mdl_foot}} +{{> html_foot}}