diff --git a/composer.json b/composer.json
index bab5170..6798f58 100644
--- a/composer.json
+++ b/composer.json
@@ -1,17 +1,15 @@
{
- "name": "Fake Reservation System",
- "description": "Send mails with markup to yourself to trigger Google Now features",
+ "name": "mbirth/FRS",
+ "description": "Fake Reservation System - Send mails with markup to yourself to trigger Google Now features",
"require": {
- "php": ">=5.3.0",
- "mustache/mustache": "~2.10",
+ "php": ">=5.6.0",
+ "mustache/mustache": "~2.11",
"bower-asset/material-design-lite": "*",
- "npm-asset/mdl-ext": "*",
- "pear/mail_mime": "^1.10",
- "google/apiclient": "^2.0.0@RC"
+ "npm-asset/mdl-ext": "*"
},
"require-dev": {
"phpunit/phpunit": "4.*",
- "npm-asset/coffee-script": "*"
+ "npm-asset/coffee-script": "~1.12"
},
"autoload": {
"classmap": ["lib/"]
diff --git a/index.php b/index.php
index 545f59e..2358cef 100644
--- a/index.php
+++ b/index.php
@@ -11,7 +11,6 @@ use \Frs\Output\Transport\GScriptTransport;
$stdout = new StdoutTransport();
$ho = new HtmlOutput($stdout, dirname(__FILE__) . '/templates');
-$ho->setTemplateVar('session_time_left', 0);
$sm = new SessionManager();
@@ -21,115 +20,75 @@ if (isset($_GET['action'])) {
}
$ho->setTemplateVar('action', $action);
$ho->setTemplateVar('action_uc', ucwords($action));
+$ho->setTemplateVar('date_today', date('Y-m-d'));
-if (isset($_GET['code']) && $_GET['code']) {
- $sm->authAndRedirect($_GET['code']); // exits
-}
-
-$tpl_done = false;
-
-// route pages that work with and without login
switch ($action) {
- case 'logout':
- $sm->logoutAndRedirect(); // exits
case 'faq':
$ho->setTemplate('faq_html');
- $tpl_done = true;
break;
+
case 'send':
- // Store input in session, in case the token timed out
+ // Store input in session, in case something happens
$sm->storeFormData($_POST['form_type']);
- break;
-}
+ echo 'This would send the mail...';
+ //$mt = new MailTransport($sm);
+ $mt = new GScriptTransport();
+ $mo = new MailOutput($mt, dirname(__FILE__) . '/templates');
+ $form_type = $_REQUEST['form_type'];
+ $mo->setTemplate('mail_' . $form_type);
+ $skey = 'form_' . $form_type;
+ $fd = new FieldDefinition($form_type);
+ $fd->setFieldValues($_SESSION[$skey]);
+ $fieldData = $fd->getFieldData();
+ $fields = $fieldData['fields'];
-if (!$tpl_done && $sm->hasSessionToken()) {
- // Authenticated
- $created = $_SESSION['access_token']['created'];
- $expires = $_SESSION['access_token']['expires_in'];
- $expire_stamp = intval($created) + intval($expires);
- $ho->setTemplateVar('session_created', $created);
- $ho->setTemplateVar('session_expires', $expires);
- $ho->setTemplateVar('session_time_left', ($expire_stamp) - time());
-
- try {
- $sm->verifySession();
- } catch (Exception $e) {
- echo $e->getMessage();
- #session_destroy();
- die();
- }
-
- $userInfo = $sm->getUserinfo();
- $ho->setTemplateVar('user', $userInfo);
- $ho->setTemplateVar('date_today', date('Y-m-d'));
-
- // Check $userdata->verifiedEmail and deny if not verified.
- if (!$userInfo['verifiedEmail']) {
- $ho->setTemplate('notverified_html');
- $tpl_done = true;
- } else {
- switch ($action) {
- case 'send':
- echo 'This would send the mail...';
- //$mt = new MailTransport($sm);
- $mt = new GScriptTransport();
- $mo = new MailOutput($mt, dirname(__FILE__) . '/templates');
- $form_type = $_REQUEST['form_type'];
- $mo->setTemplate('mail_' . $form_type);
- $skey = 'form_' . $form_type;
- $fd = new FieldDefinition($form_type);
- $fd->setFieldValues($_SESSION[$skey]);
- $fieldData = $fd->getFieldData();
- $fields = $fieldData['fields'];
-
- $data = $ho->getTemplateVars();
- $data['email_date'] = date('r');
- $data = array_merge($data, $fields);
- $mo->setTemplateVars($data);
- $mo->setTemplateVar('form_type', $form_type);
- $mo->setTemplateVar('form_type_uc', ucwords($form_type));
- $mo->setSubject('[FRS] ' . ucwords($form_type) . ' Reservation');
- $mo->addRecipient($data['user']['email'], $data['user']['name_first'] . ' ' . $data['user']['name_last']);
- $mail_sent = $mo->send();
- if ($mail_sent) {
- $ho->setTemplate('mail_sent_html');
- } else {
- $ho->setTemplate('mail_failed_html');
- }
- break;
- default:
- if (in_array($action, array('event', 'flight', 'hotel', 'restaurant', 'rentalcar', 'train', 'bus'))) {
- $ho->setTemplate($action . '_html');
- $tpl_done = true;
- $skey = 'form_' . $action;
-
- $placeholders = array(
- 'USER_NAME' => $userInfo['name_first'] . ' ' . $userInfo['name_last'],
- 'USER_EMAIL' => $userInfo['email'],
- );
- $fd = new FieldDefinition($action);
- $fd->setPlaceholders($placeholders);
- if (isset($_SESSION[$skey])) {
- $fd->setFieldValues($_SESSION[$skey]);
- }
-
- $by_group = $fd->getGroups();
-
- // Convert hash to list for Mustache compatibility
- $by_group = array_values($by_group);
- $ho->setTemplateVar('form_data', $by_group);
- }
- if (!$tpl_done) {
- $ho->setTemplate('loggedin_html');
- $tpl_done = true;
- }
- break;
+ $data = $ho->getTemplateVars();
+ $data['email_date'] = date('r');
+ $data = array_merge($data, $fields);
+ $mo->setTemplateVars($data);
+ $mo->setTemplateVar('form_type', $form_type);
+ $mo->setTemplateVar('form_type_uc', ucwords($form_type));
+ $mo->setSubject('[FRS] ' . ucwords($form_type) . ' Reservation');
+ $mo->addRecipient($data['user']['email'], $data['user']['name_first'] . ' ' . $data['user']['name_last']);
+ $mail_sent = $mo->send();
+ if ($mail_sent) {
+ $ho->setTemplate('mail_sent_html');
+ } else {
+ $ho->setTemplate('mail_failed_html');
}
- }
-} elseif (!$tpl_done) {
- // Not authenticated
- $ho->setTemplateVar('auth_url', $sm->getAuthUrl());
- $ho->setTemplate('index_html');
+ break;
+
+ case 'event':
+ case 'flight':
+ case 'hotel':
+ case 'restaurant':
+ case 'rentalcar':
+ case 'train':
+ case 'bus':
+ $ho->setTemplate($action . '_html');
+ $skey = 'form_' . $action;
+
+ $placeholders = array(
+ 'USER_NAME' => '',
+ 'USER_EMAIL' => '',
+ );
+ $fd = new FieldDefinition($action);
+ $fd->setPlaceholders($placeholders);
+ if (isset($_SESSION[$skey])) {
+ $fd->setFieldValues($_SESSION[$skey]);
+ }
+
+ $by_group = $fd->getGroups();
+
+ // Convert hash to list for Mustache compatibility
+ $by_group = array_values($by_group);
+ $ho->setTemplateVar('form_data', $by_group);
+ break;
+
+ default:
+ // Show welcome page
+ $ho->setTemplate('welcome_html');
+ break;
}
$ho->send();
diff --git a/js/session.coffee b/js/session.coffee
deleted file mode 100644
index fdec4e0..0000000
--- a/js/session.coffee
+++ /dev/null
@@ -1,16 +0,0 @@
-window.page_load_time = Math.floor(Date.now() / 1000);
-window.expire_time = window.page_load_time + window.seconds_left;
-
-window.updateTimeLeft = ->
- now = Math.floor Date.now() / 1000
- time_left = window.expire_time - now
- obj = document.getElementById 'session_expires'
- minutes = Math.floor time_left / 60
- seconds = time_left % 60
- if minutes+seconds > 0
- obj.innerHTML = ' (' + ('0' + minutes).slice(-2) + ':' + ('0' + seconds).slice(-2) + ')'
- else
- obj?.innerHTML = ''
- window.clearInterval window.updateTimer
-
-window.updateTimer = window.setInterval 'updateTimeLeft();', 1000
diff --git a/lib/Frs/Output/Transport/GmailTransport.php b/lib/Frs/Output/Transport/GmailTransport.php
deleted file mode 100644
index e71da57..0000000
--- a/lib/Frs/Output/Transport/GmailTransport.php
+++ /dev/null
@@ -1,73 +0,0 @@
-gms = new \Google_Service_Gmail($sm->getGoogleClient());
- }
-
- public function setContent($content)
- {
- $this->content = $content;
- }
-
- public function setParam($key, $value)
- {
- switch ($key) {
- case 'to':
- $this->recipients = $value;
- break;
-
- case 'subject':
- $this->subject = $value;
- break;
-
- case 'headers':
- $this->headers = $value;
- break;
- }
- }
-
- /**
- * Base64 encoding with URL/filename safe characters.
- * Taken from http://php.net/manual/en/function.base64-encode.php#103849
- *
- * @param string $data Date to encode
- * @return string Encoded data
- */
- private function base64UrlEncode($data)
- {
- return rtrim(strtr(base64_encode($data), '+/', '-_'), '=');
- }
-
- public function transmit()
- {
- $mime = new \Mail_mime();
- $mime->setParam('html_charset', 'utf-8');
- $mime->setParam('html_encoding', '8bit');
- $mime->addTo($this->recipients);
- $mime->setHTMLBody($this->content);
- $mime->setSubject($this->subject);
-
- $message_body = $mime->getMessage(null, null, $this->headers);
- $encoded_message = $this->base64UrlEncode($message_body);
-
- $postBody = new \Google_Service_Gmail_Message();
- $postBody->setRaw($encoded_message);
-
- $msg = $this->gms->users_messages->send('me', $postBody);
- if ($msg->getId()) {
- return true;
- }
- return false;
- }
-}
diff --git a/lib/Frs/Output/Transport/MailTransport.php b/lib/Frs/Output/Transport/MailTransport.php
deleted file mode 100644
index ccb0a7a..0000000
--- a/lib/Frs/Output/Transport/MailTransport.php
+++ /dev/null
@@ -1,46 +0,0 @@
-content = $content;
- }
-
- public function setParam($key, $value)
- {
- switch ($key) {
- case 'to':
- $this->recipients = $value;
- break;
-
- case 'subject':
- $this->subject = $value;
- break;
-
- case 'headers':
- $this->setHeaders($value);
- break;
- }
- }
-
- private function setHeaders($headers)
- {
- $this->headers = '';
- foreach ($headers as $key=>$value) {
- $this->headers .= $key . ': ' . $value . "\r\n";
- }
- }
-
- public function transmit()
- {
- return mail($this->recipients, $this->subject, $this->content, $this->headers);
- }
-}
diff --git a/lib/Frs/SessionManager.php b/lib/Frs/SessionManager.php
index e71e961..8c73d49 100644
--- a/lib/Frs/SessionManager.php
+++ b/lib/Frs/SessionManager.php
@@ -4,97 +4,14 @@ namespace Frs;
class SessionManager
{
- private $client;
- private $googleAuthValid;
-
public function __construct()
{
- $this->googleAuthValid = false;
- $this->client = new \Google_Client();
- $this->client->setApplicationName('Fake Reservation System');
- $this->client->setAuthConfigFile('client_secret.json');
- $this->client->addScope(\Google_Service_Oauth2::USERINFO_EMAIL);
- $this->client->addScope(\Google_Service_Gmail::GMAIL_SEND);
-
session_start();
}
- public function getAuthUrl()
- {
- return $this->client->createAuthUrl();
- }
-
- public function authAndRedirect($authCode)
- {
- // Validate OAuth2 result, set access token and redirect to self
- $this->client->authenticate($authCode);
- $_SESSION['access_token'] = $this->client->getAccessToken();
- $this->redirectAndExit();
- }
-
- public function logoutAndRedirect()
- {
- // Delete session and redirect to self
- #$this->client->setAccessToken($_SESSION['access_token']);
- #$this->client->revokeToken(); // removed granted permissions from account
- $_SESSION = array();
- if (ini_get('session.use_cookies')) {
- $params = session_get_cookie_params();
- setcookie(session_name(), '', time()-42000, $params['path'], $params['domain'], $params['secure'], $params['httponly']);
- }
- session_destroy();
- $this->redirectAndExit();
- }
-
- private function redirectAndExit()
- {
- header('Location: ' . $this->client->getRedirectUri());
- exit(0);
- }
-
public function storeFormData($form_type)
{
$skey = 'form_' . $form_type;
$_SESSION[$skey] = $_POST;
}
-
- public function hasSessionToken()
- {
- return (isset($_SESSION['access_token']) && $_SESSION['access_token']);
- }
-
- public function verifySession()
- {
- $this->client->setAccessToken($_SESSION['access_token']);
- if ($this->client->isAccessTokenExpired()) {
- throw new \Exception('Token expired. Request new one .');
- }
-
- $this->googleAuthValid = true;
- }
-
- public function getUserinfo()
- {
- if (!$this->googleAuthValid) {
- return array();
- }
- $oauth = new \Google_Service_Oauth2($this->client);
- $userdata = $oauth->userinfo->get();
-
- $result = array(
- 'name_first' => $userdata->givenName,
- 'name_last' => $userdata->familyName,
- 'name' => $userdata->name,
- 'picture' => $userdata->picture,
- 'email' => $userdata->email,
- 'gender' => $userdata->gender,
- 'verifiedEmail' => $userdata->verifiedEmail,
- );
- return $result;
- }
-
- public function getGoogleClient()
- {
- return $this->client;
- }
}
diff --git a/templates/faq_html.mustache b/templates/faq_html.mustache
index 1940fe0..332e79b 100644
--- a/templates/faq_html.mustache
+++ b/templates/faq_html.mustache
@@ -8,11 +8,49 @@
Frequently Asked Questions
+What is this?
+
+
+Some time ago, Google introduced features to highlight special items from your
+mails, like hotel reservations, event tickets, car rentals and more.
+
+
+
+Later, they added features to Google Now on Android smartphones so that you
+get notified when to leave to catch your flight or event … or how to get to
+your booked hotel and when the checkin opens.
+
+
+
+And recently, they even added a feature to Google Search, that shows your
+booked items when you search for similar things. All that from a mail in your
+inbox.
+
+
+
+A nice overview with sample images can be found on Google's Developer pages:https://developers.google.com/gmail/markup/ .
+
+
+
+But while the needed data is easy to be added to confirmation mails, many
+companies didn't do this yet. And sometimes, you don't even get any confirmation
+by email. To make those things show up in Google Now, I made this tool.
+
+
+What does it do?
+
+
+You can select a type of reservation, fill in all your details and have it sent to the mail address
+of your account. We will add all the neccessary markup to the mail so that Google Now can
+recognise it. This will make the events/reservations show up when you need them.
+
+
What happens to my data?
-Your data won't be stored on our servers. It is solely used to compose the mail.
-After the mail is sent, your data is deleted from our servers.
+Your data won't be stored on our servers. It is solely used to compose the mail. After the mail is
+sent, your data is deleted from our servers.
diff --git a/templates/index_html.mustache b/templates/index_html.mustache
deleted file mode 100644
index dee56d2..0000000
--- a/templates/index_html.mustache
+++ /dev/null
@@ -1,58 +0,0 @@
-{{> html_head}}
-{{> mdl_head}}
-{{> mdl_content_head}}
-
-
-
-What is this?
-
-
-Some time ago, Google introduced features to highlight special items from your
-mails, like hotel reservations, event tickets, car rentals and more.
-
-
-
-Later, they added features to Google Now on Android smartphones so that you
-get notified when to leave to catch your flight or event … or how to get to
-your booked hotel and when the checkin opens.
-
-
-
-And recently, they even added a feature to Google Search, that shows your
-booked items when you search for similar things. All that from a mail in your
-inbox.
-
-
-
-A nice overview with sample images can be found on Google's Developer pages:https://developers.google.com/gmail/markup/ .
-
-
-
-But while the needed data is easy to be added to confirmation mails, many
-companies didn't do this yet. And sometimes, you don't even get any confirmation
-by email. To make those things show up in Google Now, I made this tool.
-
-
-
-What does it do?
-
-
-After login with your Google account, you can select a type of reservation,
-fill in all your details and send it to the mail address of your account.
-We will add all the neccessary markup to the mail so that Google Now can
-recognise it. This will make the events/reservations show up when you need
-them.
-
-
-
-To begin, please sign in:
-
-{{> mdl_content_foot}}
-{{> mdl_foot}}
-View Source
-{{> html_foot}}
diff --git a/templates/notverified_html.mustache b/templates/notverified_html.mustache
deleted file mode 100644
index 93bdaa0..0000000
--- a/templates/notverified_html.mustache
+++ /dev/null
@@ -1,21 +0,0 @@
-{{> html_head}}
-{{> mdl_head}}
-{{> mdl_content_head}}
-
-
-
-Your email address is not verified!
-
- To use this system, you must verify your Google email address first!
-
-
-
- You can find more information at this address:https://support.google.com/accounts/answer/63950 .
-
-
-{{> mdl_content_foot}}
-{{> mdl_foot}}
-{{> html_foot}}
diff --git a/templates/partials/mdl_head.mustache b/templates/partials/mdl_head.mustache
index 2e9916f..5e81fda 100644
--- a/templates/partials/mdl_head.mustache
+++ b/templates/partials/mdl_head.mustache
@@ -5,22 +5,15 @@
- {{# user.name_first}}
- Hello, {{user.name_first}}!
- {{/ user.name_first}}
-
-
-
-
diff --git a/templates/loggedin_html.mustache b/templates/welcome_html.mustache
similarity index 92%
rename from templates/loggedin_html.mustache
rename to templates/welcome_html.mustache
index 9e14439..1803771 100644
--- a/templates/loggedin_html.mustache
+++ b/templates/welcome_html.mustache
@@ -3,7 +3,7 @@
{{> mdl_content_head}}
Select the type of reservation you want to create
@@ -81,4 +81,5 @@
{{> mdl_content_foot}}
{{> mdl_foot}}
+View Source
{{> html_foot}}
-