Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: mikevalstar/gameknight
base: 40a6c8ee40
...
head fork: mikevalstar/gameknight
compare: 963d722c2d
  • 2 commits
  • 4 files changed
  • 0 commit comments
  • 1 contributor
View
13 class/email.class.php
@@ -3,7 +3,9 @@
class email{
static function send($to, $to_name, $subject, $message, $messageHTML = false){
- $transport = Swift_MailTransport::newInstance();
+ $transport = Swift_SmtpTransport::newInstance(EMAIL_SERVER, 25)
+ ->setUsername(EMAIL_FROM)
+ ->setPassword(EMAIL_PASSWORD);
$mailer = Swift_Mailer::newInstance($transport);
$message = Swift_Message::newInstance()
@@ -12,7 +14,7 @@ static function send($to, $to_name, $subject, $message, $messageHTML = false){
->setSubject($subject)
// Set the From address with an associative array
- ->setFrom(array('no-reply@konradgroup.com' => 'KG Game Knight'))
+ ->setFrom(array(EMAIL_FROM => EMAIL_FROM_NAME))
// Set the To addresses with an associative array
->setTo(array($to => $to_name))
@@ -34,7 +36,10 @@ static function send_all($subject, $message, $messageHTML = false){
foreach($users as $v)
$user_array[$v['email']] = $v['name_first'] . ' ' . $v['name_last'];
- $transport = Swift_MailTransport::newInstance();
+ $transport = Swift_SmtpTransport::newInstance(EMAIL_SERVER, 25)
+ ->setUsername(EMAIL_FROM)
+ ->setPassword(EMAIL_PASSWORD);
+
$mailer = Swift_Mailer::newInstance($transport);
$message = Swift_Message::newInstance()
@@ -43,7 +48,7 @@ static function send_all($subject, $message, $messageHTML = false){
->setSubject($subject)
// Set the From address with an associative array
- ->setFrom(array('no-reply@konradgroup.com' => 'KG Game Knight'))
+ ->setFrom(array(EMAIL_FROM => EMAIL_FROM_NAME))
// Set the To addresses with an associative array
->setTo($user_array)
View
5 include/config.inc.example
@@ -7,6 +7,11 @@ define('DB_DB', 'kggamenight');
define('ENV', 'development');
+define('EMAIL_FROM', 'no-reply@example.com');
+define('EMAIL_FROM_NAME', 'KG Game Knight');
+define('EMAIL_SERVER', 'mail.example.com');
+define('EMAIL_PASSWORD', 'password');
+
define('LOGIT_WEB', __DIR__.'/../log/web.log');
define('LOGIT_CRON', __DIR__.'/../log/cron.log');
define('LOGIT_COMMON', __DIR__.'/../log/common.log');
View
3  template/manage/events_item_ro.tpl
@@ -9,7 +9,8 @@
<div class="row">
<div class="span4">
<h3>Details</h3>
- <h5>{$event->event_start|x} - {$event->event_end|x}</h5>
+ <h4>Location: {$event->location|x}</h4>
+ <h4>{$event->event_start|x} - {$event->event_end|x}</h4>
<p>{$event->event_text|nl2br}</p>
View
2  template/manage/games_item.tpl
@@ -1,6 +1,6 @@
{extends 'layout.tpl'}
{block "navbar-top"}
- <form class="form-search navbar-form pull-right">
+ <form class="form-search navbar-form pull-right" action="/games">
<div class="input-append">
<input type="text" name="filter" class="input-medium search-query" placeholder="Search Games" />
<button class="btn" type="submit">Search</button>

No commit comments for this range

Something went wrong with that request. Please try again.