Merge pull request #30 from zerooo-vpn/addEmailToUser

[WIP] Add email to user

bin/setup_web

@@ -2,9 +2,9 @@
 cd "$(realpath "$(dirname "$0")/..")";
 
 composer install;
-mkdir storage;
+test -d storage || mkdir storage;
 touch storage/db.sqlite;
-./vendor/bin/propel sql:build
+./vendor/bin/propel sql:build --overwrite;
 ./vendor/bin/propel sql:insert;
 
 echo "Done setting up web environment"

composer.json

@@ -18,7 +18,8 @@
     "monolog/monolog": "1.18.1",
     "aura/session": "2.0.1",
     "guzzlehttp/guzzle": "^6.2",
-    "tedivm/stash": "^0.14.1"
+    "tedivm/stash": "^0.14.1",
+    "nette/mail": "^2.4"
   },
   "autoload": {
     "psr-4": {

composer.lock

@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "7f7a5098d89b4841741255592bee1890",
+    "hash": "f556821ab12200640359e07901f52831",
-    "content-hash": "045408fd26a025036d65a2e00bb8a369",
+    "content-hash": "d7aa70c700afbad2c8b24da7c015c06e",
     "packages": [
         {
             "name": "aura/session",
@@ -404,6 +404,128 @@
             ],
             "time": "2016-03-13 16:08:35"
         },
+        {
+            "name": "nette/mail",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/mail.git",
+                "reference": "d637f106bf2bf72f75ff1e8f1d534e8ce7d097c3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/mail/zipball/d637f106bf2bf72f75ff1e8f1d534e8ce7d097c3",
+                "reference": "d637f106bf2bf72f75ff1e8f1d534e8ce7d097c3",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "nette/utils": "~2.4",
+                "php": ">=5.6.0"
+            },
+            "conflict": {
+                "nette/nette": "<2.2"
+            },
+            "require-dev": {
+                "nette/di": "~2.3",
+                "nette/tester": "~2.0",
+                "tracy/tracy": "^2.3"
+            },
+            "suggest": {
+                "ext-fileinfo": "to detect type of attached files"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0",
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "Nette Mail: Sending E-mails",
+            "homepage": "https://nette.org",
+            "time": "2016-06-25 15:15:57"
+        },
+        {
+            "name": "nette/utils",
+            "version": "v2.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nette/utils.git",
+                "reference": "c455ade9f24a1f99aa81772516764045296b8ca0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nette/utils/zipball/c455ade9f24a1f99aa81772516764045296b8ca0",
+                "reference": "c455ade9f24a1f99aa81772516764045296b8ca0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6.0"
+            },
+            "conflict": {
+                "nette/nette": "<2.2"
+            },
+            "require-dev": {
+                "nette/tester": "~2.0",
+                "tracy/tracy": "^2.3"
+            },
+            "suggest": {
+                "ext-gd": "to use Image",
+                "ext-iconv": "to use Strings::webalize() and toAscii()",
+                "ext-intl": "for script transliteration in Strings::webalize() and toAscii()",
+                "ext-mbstring": "to use Strings::lower() etc..."
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.4-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause",
+                "GPL-2.0",
+                "GPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Grudl",
+                    "homepage": "https://davidgrudl.com"
+                },
+                {
+                    "name": "Nette Community",
+                    "homepage": "https://nette.org/contributors"
+                }
+            ],
+            "description": "Nette Utility Classes",
+            "homepage": "https://nette.org",
+            "time": "2016-06-17 13:15:10"
+        },
         {
             "name": "nikic/fast-route",
             "version": "v0.6.0",

config/app.yml

@@ -7,6 +7,7 @@ core:
     author: "EaterOfCode"
     sessionName: '0sess'
     github-repo: 'zerooo-vpn/zer.ooo'
+    base-url: 'https://zer.ooo'
   services:
     slim: Eater\Glim\Service\Slim
     user: Eater\Glim\Service\User
@@ -17,3 +18,5 @@ core:
     server: Eater\Glim\Service\Server
     stash: Eater\Glim\Service\Stash
     github: Eater\Glim\Service\GitHub
+    mail-sender: Eater\Glim\Service\MailSender
+    mail: Eater\Glim\Service\Mail

config/routes.yml

@@ -11,6 +11,9 @@ routes:
     get: Register\Show
     post: Register\Action
   /logout: Logout
+  /verify/{verify}:
+    get: Verify\Show
+    post: Verify\Action
   /ca: CA
   /crl: CRL
   /panel:

config/schema.xml

@@ -3,10 +3,11 @@
           xsi:noNamespaceSchemaLocation="http://xsd.propelorm.org/1.6/database.xsd"
           namespace="Eater\Glim\Model"
         >
-    <table name="User">
+    <table name="user">
         <column name="id" type="integer" primaryKey="true" autoIncrement="true" />
         <column name="max_keys" type="integer" default="5" />
         <column name="username" type="varchar" size="64" />
+        <column name="email" type="integer" />
         <column name="password" type="varchar" size="64" />
         <column name="superuser" type="boolean" default="false" />
         <column name="max_invites" type="integer" default="0" />
@@ -15,9 +16,40 @@
         <unique>
             <unique-column name="username" />
         </unique>
+
+        <foreign-key foreignTable="email_address">
+            <reference local="email" foreign="id" />
+        </foreign-key>
+    </table>
+
+    <table name="email_address">
+        <column name="id" type="integer" primaryKey="true" autoIncrement="true" />
+        <column name="verified" type="boolean" default="false" />
+        <column name="verification" type="varchar" size="64" />
+        <column name="address" type="varchar" size="256" />
+        <column name="owner" type="integer" />
+
+        <foreign-key foreignTable="user">
+            <reference local="owner" foreign="id" />
+        </foreign-key>
+    </table>
+
+    <table name="email_message">
+        <column name="recipient" type="integer" />
+        <column name="sender" type="integer" />
+        <column name="contents" type="longvarchar" />
+        <column name="subject" type="varchar" size="256" />
+
+        <foreign-key phpName="RecipientEmailAddress" foreignTable="email_address">
+            <reference local="recipient" foreign="id" />
+        </foreign-key>
+
+        <foreign-key phpName="SenderEmailAddress" foreignTable="email_address">
+            <reference local="sender" foreign="id" />
+        </foreign-key>
     </table>
 
-    <table name="Certificate">
+    <table name="certificate">
         <column name="id" type="integer" primaryKey="true" autoIncrement="true" />
         <column name="user_id" type="integer" />
         <column name="name" type="varchar" size="64" />
@@ -40,22 +72,22 @@
             <unique-column name="user_id" />
         </unique>
 
-        <foreign-key foreignTable="User">
+        <foreign-key foreignTable="user">
             <reference local="user_id" foreign="id" />
         </foreign-key>
     </table>
 
-    <table name="Invite">
+    <table name="invite">
         <column name="id" type="integer" primaryKey="true" autoIncrement="true" />
         <column name="invite" type="varchar" size="64" />
         <column name="owner" type="integer" />
 
-        <foreign-key foreignTable="User">
+        <foreign-key foreignTable="user">
             <reference local="owner" foreign="id" />
         </foreign-key>
     </table>
 
-    <table name="Server">
+    <table name="server">
         <column name="id" type="integer" primaryKey="true" autoIncrement="true" />
         <column name="fqdn" type="varchar" size="64" />
         <column name="fingerprint" type="varchar" size="64"/>

public/css/main.css

@@ -140,6 +140,10 @@ ul.topnav li a:hover {
 ul.topnav li.icon {
   display: none; }
 
+.message {
+  padding: 15px;
+  font-size: 1.2em; }
+
 input {
   padding: 10px;
   box-sizing: border-box;

public/css/main.css.map

@@ -1,7 +1,7 @@
 {
 "version": 3,
-"mappings": "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",
+"mappings": "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",
-"sources": ["main.scss","modules/_modules.scss","partials/_base.scss","partials/_navigation.sass","partials/_forms.sass","partials/_fonts.scss","partials/_typography.scss","partials/_tooltips.scss"],
+"sources": ["main.scss","modules/_modules.scss","partials/_base.scss","partials/_navigation.sass","partials/_messages.scss","partials/_forms.sass","partials/_fonts.scss","partials/_typography.scss","partials/_tooltips.scss"],
 "names": [],
 "file": "main.css"
 }

public/css/main.scss

@@ -13,6 +13,7 @@
 // partials
 @import "partials/_base";
 @import "partials/_navigation";
+@import "partials/_messages";
 @import "partials/_forms";
 @import "partials/_fonts";
 @import "partials/_typography";

public/css/partials/_messages.scss

@@ -0,0 +1,4 @@
+.message {
+  padding: 15px;
+  font-size: 1.2em;
+}

src/Core.php

@@ -9,6 +9,7 @@ use Monolog\Handler\StreamHandler;
 use Monolog\Logger;
 use Noodlehaus\Config;
 use Propel\Runtime\Propel;
+use Psr\Http\Message\UriInterface;
 use Slim\App;
 use Slim\Container;
 use Slim\Http\Request;
@@ -140,7 +141,7 @@ class Core implements ContainerInterface
     }
 
     /**
-     * @return mixed
+     * @return Config
      */
     public function getConfig()
     {
@@ -148,7 +149,7 @@ class Core implements ContainerInterface
     }
 
     /**
-     * @param mixed $config
+     * @param Config $config
      */
     public function setConfig($config)
     {
@@ -314,6 +315,21 @@ class Core implements ContainerInterface
         return $this->get('slim');
     }
 
+    /**
+     * @param UriInterface $uri
+     * @return string
+     */
+    private function getBaseUrlFromUri(UriInterface $uri) {
+        $baseUrl = $uri->getScheme() . '://' . $uri->getHost();
+
+        if (($uri->getScheme() === 'http' && $uri->getPort() != 80) ||
+            ($uri->getScheme() === 'https' && $uri->getPort() != 443)) {
+            $baseUrl .= ':' . $uri->getPort();
+        }
+
+        return $baseUrl;
+    }
+
     /**
      * @param string $class
      * @param Request $request
@@ -324,6 +340,11 @@ class Core implements ContainerInterface
     public function handle($class, Request $request, Response $response, ContainerInterface $containerInterface)
     {
         $this->startTimer(['response']);
+
+        /** set host */
+
+        $this->set('base-url', $this->getBaseUrlFromUri($request->getUri()));
+
         /** @var Handler\Main $handler */
         $handler = new $class($this, $request, $response, $containerInterface);
 

src/Handler/Install/Action.php

@@ -37,12 +37,17 @@ class Action extends Show
         $newUser = null;
 
         try {
-            $newUser = $user->createSuperuser($this->post('username'), $this->post('password'));
+            $newUser = $user->createSuperuser($this->post('username'), $this->post('email'), $this->post('password'));
         } catch (\Exception $e) {
             $segment->setFlash("error", $e->getMessage());
         }
 
         if ($newUser === null) {
+            $segment->setFlash('email', $this->post('email'));
+            $segment->setFlash('username', $this->post('username'));
+            $segment->setFlash('hostnameWithPort', $this->post('domainWithPort'));
+            $segment->setFlash('hostname', $caCN);
+
             return $this->redirect('/install');
         }
 

src/Handler/Install/Show.php

@@ -23,13 +23,20 @@ class Show extends Main
             $hasOpenSsl = $return === 0;
         }
 
+        /* @var \Aura\Session\Session $session */
+        $session = $this->get('session');
+        $segment = $session->getSegment('main');
+
         $data = [
             'hasExecEnabled' => $execEnabled,
             'hasOpenSsl' => $hasOpenSsl,
             'hasOpenSslExtension' => extension_loaded('openssl'),
             'hasZipExtension' => extension_loaded('zip'),
-            'hostname' => parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST),
+            'hostname' => $segment->getFlash('hostname', parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST)),
-            'hostnameWithPort' => $_SERVER['HTTP_HOST']
+            'hostnameWithPort' => $segment->getFlash('hostnameWithPort', $_SERVER['HTTP_HOST']),
+            'error' => $segment->getFlash('error'),
+            'username' => $segment->getFlash('username'),
+            'email' => $segment->getFlash('email')
         ];
 
         return $this->render('install.html.twig', $data);

src/Handler/Login/Action.php

@@ -28,11 +28,21 @@ class Action extends Main
         $loggedUser = $user->login($username, $password);
 
         if ($loggedUser === null) {
-            $segment->setFlash("error", "Login failed, username or password are incorrect");
+            $segment->setFlash("message", "Login failed, username or password are incorrect");
+            $segment->setFlash('username', $username);
 
             return $this->redirect('/login');
         }
 
+        $email = $loggedUser->getEmailAddressRelatedByEmail();
+        if ($email !== null || !$email->isVerified()) {
+            $segment->setFlash("message", "Please verify your email before logging in");
+            $segment->setFlash('username', $username);
+
+            return $this->redirect('/login');
+        }
+
+
         $segment->set('userId', $loggedUser->getId());
 
         $afterLogin = $segment->get('afterLogin');

src/Handler/Login/Show.php

@@ -35,7 +35,8 @@ class Show extends Main
         /** @var Segment $segment */
         $segment = $this->get('session')->getSegment('main');
 
-        $this->get('twig-vars')->def('error', $segment->getFlash('error'));
+        $this->get('twig-vars')->def('username', $segment->getFlash('username'));
+        $this->get('twig-vars')->def('message', $segment->getFlash('message'));
 
         return $this->render(
             "login.html.twig"

src/Handler/Main.php

@@ -156,4 +156,10 @@ abstract class Main implements ContainerInterface
     {
         return $this->getRequest()->getAttribute($name);
     }
+
+    public function notFound() {
+        /** @var callable $notFoundHandler */
+        $notFoundHandler = $this->get('notFoundHandler');
+        return $notFoundHandler($this->getRequest(), $this->getResponse());
+    }
 }

src/Handler/Register/Action.php

@@ -19,6 +19,7 @@ class Action extends Main
         $invite   = $this->post('invite');
         $username = $this->post('username');
         $password = $this->post('password');
+        $email    = $this->post('email');
 
         /** @var User $user */
         $user = $this->get('user');
@@ -30,12 +31,16 @@ class Action extends Main
         $newUser = null;
 
         try {
-            $newUser = $user->register($invite, $username, $password);
+            $newUser = $user->register($invite, $username, $email, $password);
         } catch (\Exception $e) {
             $segment->setFlash("error", $e->getMessage());
         }
 
         if ($newUser === null) {
+            $segment->setFlash('username', $username);
+            $segment->setFlash('email', $email);
+            $segment->setFlash('invite', $invite);
+
             return $this->redirect('/register');
         }
 

src/Handler/Register/Show.php

@@ -9,6 +9,7 @@
 namespace Eater\Glim\Handler\Register;
 
 
+use Aura\Session\Segment;
 use Eater\Glim\Handler\Main;
 
 class Show extends Main
@@ -18,8 +19,11 @@ class Show extends Main
         /** @var Segment $segment */
         $segment = $this->get('session')->getSegment('main');
 
-        $this->get('twig-vars')->def('error', $segment->getFlash('error'));
+        return $this->render('register.html.twig', [
-
+            'error' => $segment->getFlash('error'),
-        return $this->render('register.html.twig');
+            'username' => $segment->getFlash('username'),
+            'invite' => $segment->getFlash('invite'),
+            'email' => $segment->getFlash('email')
+        ]);
     }
 }

src/Handler/Verify/Action.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace Eater\Glim\Handler\Verify;
+
+use Eater\Glim\Handler\Session;
+use Eater\Glim\Model\EmailAddressQuery;
+use Eater\Glim\Service\User;
+
+class Action extends Session
+{
+    protected $shouldHaveUser = false;
+
+    public function handle()
+    {
+        $verify = $this->attr('verify');
+        $verifyParts = explode('-', $verify, 2);
+
+        if (count($verifyParts) < 2) {
+            return $this->notFound();
+        }
+
+        $username = $this->post('username');
+        $password = $this->post('password');
+
+        /* @var User $user */
+        $user = $this->get('user');
+        /* @var \Aura\Session\Session $session */
+        $session = $this->get('session');
+        $segment = $session->getSegment('main');
+
+        $loggedUser = $user->login($username, $password);
+
+        if ($loggedUser === null) {
+            $segment->setFlash("message", "Login failed, username or password are incorrect");
+            $segment->setFlash('username', $username);
+
+            return $this->redirect($this->getRequest()->getUri()->getPath());
+        }
+
+        $segment->set('userId', $loggedUser->getId());
+
+        $id = intval($verifyParts[0]);
+        $verification = $verifyParts[1];
+
+
+        $email = $loggedUser->getEmailAddressRelatedByEmail();
+
+        if ($email === null || $email->getId() !== $id || $email->getVerified()) {
+            return $this->notFound();
+        }
+
+        $email = EmailAddressQuery::create()->findOneById($id);
+
+        if ($email === null || $email->getVerified() || $email->getVerification() !== $verification) {
+            return $this->notFound();
+        }
+
+        $email->setVerified(true);
+        $email->save();
+
+        $segment->setFlash('message', 'Successfully verified "' . $email->getAddress() .'"');
+
+        return $this->redirect('/panel');
+    }
+}

src/Handler/Verify/Show.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace Eater\Glim\Handler\Verify;
+
+use Aura\Session\Segment;
+use Eater\Glim\Handler\Session;
+use Eater\Glim\Model\EmailAddressQuery;
+use Eater\Glim\Model\User;
+
+class Show extends Session
+{
+    protected $shouldHaveUser = false;
+
+    public function handle()
+    {
+        $verify = $this->attr('verify');
+        $verifyParts = explode('-', $verify, 2);
+
+        if (count($verifyParts) < 2) {
+            return $this->notFound();
+        }
+
+        $id = intval($verifyParts[0]);
+        $verification = $verifyParts[1];
+
+        $user = $this->getUser();
+        
+        if ($user !== null) {
+            
+            $email = $user->getEmailAddressRelatedByEmail();
+            
+            if ($email === null || $email->getId() !== $id || $email->getVerified()) {
+                return $this->notFound();
+            }
+            
+            /* @var \Aura\Session\Session $session */
+            $session = $this->get('session');
+            $segment = $session->getSegment('main');
+            $segment->set('userId', null);
+            $this->setUser(null);
+        }
+
+        $email = EmailAddressQuery::create()->findOneById($id);
+
+        if ($email === null || $email->getVerified() || $email->getVerification() !== $verification) {
+            return $this->notFound();
+        }
+
+        return $this->render('login.html.twig', [
+            'message' => 'Please login to verify your email',
+            'action' => $this->getRequest()->getUri()->getPath()
+        ]);
+    }
+}

src/Model/Base/Certificate.php

@@ -23,7 +23,7 @@ use Propel\Runtime\Parser\AbstractParser;
 use Propel\Runtime\Util\PropelDateTime;
 
 /**
- * Base class that represents a row from the 'Certificate' table.
+ * Base class that represents a row from the 'certificate' table.
  *
  *
  *
@@ -937,7 +937,7 @@ abstract class Certificate implements ActiveRecordInterface
         }
 
         $sql = sprintf(
-            'INSERT INTO Certificate (%s) VALUES (%s)',
+            'INSERT INTO certificate (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
@@ -1116,7 +1116,7 @@ abstract class Certificate implements ActiveRecordInterface
                         $key = 'user';
                         break;
                     case TableMap::TYPE_FIELDNAME:
-                        $key = 'User';
+                        $key = 'user';
                         break;
                     default:
                         $key = 'User';

src/Model/Base/CertificateQuery.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 
 /**
- * Base class that represents a query for the 'Certificate' table.
+ * Base class that represents a query for the 'certificate' table.
  *
  *
  *
@@ -173,7 +173,7 @@ abstract class CertificateQuery extends ModelCriteria
      */
     protected function findPkSimple($key, ConnectionInterface $con)
     {
-        $sql = 'SELECT id, user_id, name, certificate, private_key, expires_on, revoked, serial FROM Certificate WHERE id = :p0';
+        $sql = 'SELECT id, user_id, name, certificate, private_key, expires_on, revoked, serial FROM certificate WHERE id = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -627,7 +627,7 @@ abstract class CertificateQuery extends ModelCriteria
     }
 
     /**
-     * Deletes all rows from the Certificate table.
+     * Deletes all rows from the certificate table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Base/EmailAddressQuery.php

@@ -0,0 +1,805 @@
+<?php
+
+namespace Eater\Glim\Model\Base;
+
+use \Exception;
+use \PDO;
+use Eater\Glim\Model\EmailAddress as ChildEmailAddress;
+use Eater\Glim\Model\EmailAddressQuery as ChildEmailAddressQuery;
+use Eater\Glim\Model\Map\EmailAddressTableMap;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\PropelException;
+
+/**
+ * Base class that represents a query for the 'email_address' table.
+ *
+ *
+ *
+ * @method     ChildEmailAddressQuery orderById($order = Criteria::ASC) Order by the id column
+ * @method     ChildEmailAddressQuery orderByVerified($order = Criteria::ASC) Order by the verified column
+ * @method     ChildEmailAddressQuery orderByVerification($order = Criteria::ASC) Order by the verification column
+ * @method     ChildEmailAddressQuery orderByAddress($order = Criteria::ASC) Order by the address column
+ * @method     ChildEmailAddressQuery orderByOwner($order = Criteria::ASC) Order by the owner column
+ *
+ * @method     ChildEmailAddressQuery groupById() Group by the id column
+ * @method     ChildEmailAddressQuery groupByVerified() Group by the verified column
+ * @method     ChildEmailAddressQuery groupByVerification() Group by the verification column
+ * @method     ChildEmailAddressQuery groupByAddress() Group by the address column
+ * @method     ChildEmailAddressQuery groupByOwner() Group by the owner column
+ *
+ * @method     ChildEmailAddressQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildEmailAddressQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildEmailAddressQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildEmailAddressQuery leftJoinUserRelatedByOwner($relationAlias = null) Adds a LEFT JOIN clause to the query using the UserRelatedByOwner relation
+ * @method     ChildEmailAddressQuery rightJoinUserRelatedByOwner($relationAlias = null) Adds a RIGHT JOIN clause to the query using the UserRelatedByOwner relation
+ * @method     ChildEmailAddressQuery innerJoinUserRelatedByOwner($relationAlias = null) Adds a INNER JOIN clause to the query using the UserRelatedByOwner relation
+ *
+ * @method     ChildEmailAddressQuery leftJoinUserRelatedByEmail($relationAlias = null) Adds a LEFT JOIN clause to the query using the UserRelatedByEmail relation
+ * @method     ChildEmailAddressQuery rightJoinUserRelatedByEmail($relationAlias = null) Adds a RIGHT JOIN clause to the query using the UserRelatedByEmail relation
+ * @method     ChildEmailAddressQuery innerJoinUserRelatedByEmail($relationAlias = null) Adds a INNER JOIN clause to the query using the UserRelatedByEmail relation
+ *
+ * @method     ChildEmailAddressQuery leftJoinEmailMessageRelatedByRecipient($relationAlias = null) Adds a LEFT JOIN clause to the query using the EmailMessageRelatedByRecipient relation
+ * @method     ChildEmailAddressQuery rightJoinEmailMessageRelatedByRecipient($relationAlias = null) Adds a RIGHT JOIN clause to the query using the EmailMessageRelatedByRecipient relation
+ * @method     ChildEmailAddressQuery innerJoinEmailMessageRelatedByRecipient($relationAlias = null) Adds a INNER JOIN clause to the query using the EmailMessageRelatedByRecipient relation
+ *
+ * @method     ChildEmailAddressQuery leftJoinEmailMessageRelatedBySender($relationAlias = null) Adds a LEFT JOIN clause to the query using the EmailMessageRelatedBySender relation
+ * @method     ChildEmailAddressQuery rightJoinEmailMessageRelatedBySender($relationAlias = null) Adds a RIGHT JOIN clause to the query using the EmailMessageRelatedBySender relation
+ * @method     ChildEmailAddressQuery innerJoinEmailMessageRelatedBySender($relationAlias = null) Adds a INNER JOIN clause to the query using the EmailMessageRelatedBySender relation
+ *
+ * @method     \Eater\Glim\Model\UserQuery|\Eater\Glim\Model\EmailMessageQuery endUse() Finalizes a secondary criteria and merges it with its primary Criteria
+ *
+ * @method     ChildEmailAddress findOne(ConnectionInterface $con = null) Return the first ChildEmailAddress matching the query
+ * @method     ChildEmailAddress findOneOrCreate(ConnectionInterface $con = null) Return the first ChildEmailAddress matching the query, or a new ChildEmailAddress object populated from the query conditions when no match is found
+ *
+ * @method     ChildEmailAddress findOneById(int $id) Return the first ChildEmailAddress filtered by the id column
+ * @method     ChildEmailAddress findOneByVerified(boolean $verified) Return the first ChildEmailAddress filtered by the verified column
+ * @method     ChildEmailAddress findOneByVerification(string $verification) Return the first ChildEmailAddress filtered by the verification column
+ * @method     ChildEmailAddress findOneByAddress(string $address) Return the first ChildEmailAddress filtered by the address column
+ * @method     ChildEmailAddress findOneByOwner(int $owner) Return the first ChildEmailAddress filtered by the owner column *
+
+ * @method     ChildEmailAddress requirePk($key, ConnectionInterface $con = null) Return the ChildEmailAddress by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailAddress requireOne(ConnectionInterface $con = null) Return the first ChildEmailAddress matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ *
+ * @method     ChildEmailAddress requireOneById(int $id) Return the first ChildEmailAddress filtered by the id column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailAddress requireOneByVerified(boolean $verified) Return the first ChildEmailAddress filtered by the verified column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailAddress requireOneByVerification(string $verification) Return the first ChildEmailAddress filtered by the verification column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailAddress requireOneByAddress(string $address) Return the first ChildEmailAddress filtered by the address column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailAddress requireOneByOwner(int $owner) Return the first ChildEmailAddress filtered by the owner column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ *
+ * @method     ChildEmailAddress[]|ObjectCollection find(ConnectionInterface $con = null) Return ChildEmailAddress objects based on current ModelCriteria
+ * @method     ChildEmailAddress[]|ObjectCollection findById(int $id) Return ChildEmailAddress objects filtered by the id column
+ * @method     ChildEmailAddress[]|ObjectCollection findByVerified(boolean $verified) Return ChildEmailAddress objects filtered by the verified column
+ * @method     ChildEmailAddress[]|ObjectCollection findByVerification(string $verification) Return ChildEmailAddress objects filtered by the verification column
+ * @method     ChildEmailAddress[]|ObjectCollection findByAddress(string $address) Return ChildEmailAddress objects filtered by the address column
+ * @method     ChildEmailAddress[]|ObjectCollection findByOwner(int $owner) Return ChildEmailAddress objects filtered by the owner column
+ * @method     ChildEmailAddress[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit
+ *
+ */
+abstract class EmailAddressQuery extends ModelCriteria
+{
+    protected $entityNotFoundExceptionClass = '\\Propel\\Runtime\\Exception\\EntityNotFoundException';
+
+    /**
+     * Initializes internal state of \Eater\Glim\Model\Base\EmailAddressQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'default', $modelName = '\\Eater\\Glim\\Model\\EmailAddress', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildEmailAddressQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildEmailAddressQuery
+     */
+    public static function create($modelAlias = null, Criteria $criteria = null)
+    {
+        if ($criteria instanceof ChildEmailAddressQuery) {
+            return $criteria;
+        }
+        $query = new ChildEmailAddressQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildEmailAddress|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, ConnectionInterface $con = null)
+    {
+        if ($key === null) {
+            return null;
+        }
+        if ((null !== ($obj = EmailAddressTableMap::getInstanceFromPool((string) $key))) && !$this->formatter) {
+            // the object is already in the instance pool
+            return $obj;
+        }
+        if ($con === null) {
+            $con = Propel::getServiceContainer()->getReadConnection(EmailAddressTableMap::DATABASE_NAME);
+        }
+        $this->basePreSelect($con);
+        if ($this->formatter || $this->modelAlias || $this->with || $this->select
+         || $this->selectColumns || $this->asColumns || $this->selectModifiers
+         || $this->map || $this->having || $this->joins) {
+            return $this->findPkComplex($key, $con);
+        } else {
+            return $this->findPkSimple($key, $con);
+        }
+    }
+
+    /**
+     * Find object by primary key using raw SQL to go fast.
+     * Bypass doSelect() and the object formatter by using generated code.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return ChildEmailAddress A model object, or null if the key is not found
+     */
+    protected function findPkSimple($key, ConnectionInterface $con)
+    {
+        $sql = 'SELECT id, verified, verification, address, owner FROM email_address WHERE id = :p0';
+        try {
+            $stmt = $con->prepare($sql);
+            $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
+            $stmt->execute();
+        } catch (Exception $e) {
+            Propel::log($e->getMessage(), Propel::LOG_ERR);
+            throw new PropelException(sprintf('Unable to execute SELECT statement [%s]', $sql), 0, $e);
+        }
+        $obj = null;
+        if ($row = $stmt->fetch(\PDO::FETCH_NUM)) {
+            /** @var ChildEmailAddress $obj */
+            $obj = new ChildEmailAddress();
+            $obj->hydrate($row);
+            EmailAddressTableMap::addInstanceToPool($obj, (string) $key);
+        }
+        $stmt->closeCursor();
+
+        return $obj;
+    }
+
+    /**
+     * Find object by primary key.
+     *
+     * @param     mixed $key Primary key to use for the query
+     * @param     ConnectionInterface $con A connection object
+     *
+     * @return ChildEmailAddress|array|mixed the result, formatted by the current formatter
+     */
+    protected function findPkComplex($key, ConnectionInterface $con)
+    {
+        // As the query uses a PK condition, no limit(1) is necessary.
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKey($key)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->formatOne($dataFetcher);
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(12, 56, 832), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getReadConnection($this->getDbName());
+        }
+        $this->basePreSelect($con);
+        $criteria = $this->isKeepQuery() ? clone $this : $this;
+        $dataFetcher = $criteria
+            ->filterByPrimaryKeys($keys)
+            ->doSelect($con);
+
+        return $criteria->getFormatter()->init($criteria)->format($dataFetcher);
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_ID, $key, Criteria::EQUAL);
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_ID, $keys, Criteria::IN);
+    }
+
+    /**
+     * Filter the query on the id column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterById(1234); // WHERE id = 1234
+     * $query->filterById(array(12, 34)); // WHERE id IN (12, 34)
+     * $query->filterById(array('min' => 12)); // WHERE id > 12
+     * </code>
+     *
+     * @param     mixed $id The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterById($id = null, $comparison = null)
+    {
+        if (is_array($id)) {
+            $useMinMax = false;
+            if (isset($id['min'])) {
+                $this->addUsingAlias(EmailAddressTableMap::COL_ID, $id['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($id['max'])) {
+                $this->addUsingAlias(EmailAddressTableMap::COL_ID, $id['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_ID, $id, $comparison);
+    }
+
+    /**
+     * Filter the query on the verified column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByVerified(true); // WHERE verified = true
+     * $query->filterByVerified('yes'); // WHERE verified = true
+     * </code>
+     *
+     * @param     boolean|string $verified The value to use as filter.
+     *              Non-boolean arguments are converted using the following rules:
+     *                * 1, '1', 'true',  'on',  and 'yes' are converted to boolean true
+     *                * 0, '0', 'false', 'off', and 'no'  are converted to boolean false
+     *              Check on string values is case insensitive (so 'FaLsE' is seen as 'false').
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByVerified($verified = null, $comparison = null)
+    {
+        if (is_string($verified)) {
+            $verified = in_array(strtolower($verified), array('false', 'off', '-', 'no', 'n', '0', '')) ? false : true;
+        }
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_VERIFIED, $verified, $comparison);
+    }
+
+    /**
+     * Filter the query on the verification column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByVerification('fooValue');   // WHERE verification = 'fooValue'
+     * $query->filterByVerification('%fooValue%'); // WHERE verification LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $verification The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByVerification($verification = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($verification)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $verification)) {
+                $verification = str_replace('*', '%', $verification);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_VERIFICATION, $verification, $comparison);
+    }
+
+    /**
+     * Filter the query on the address column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByAddress('fooValue');   // WHERE address = 'fooValue'
+     * $query->filterByAddress('%fooValue%'); // WHERE address LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $address The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByAddress($address = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($address)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $address)) {
+                $address = str_replace('*', '%', $address);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_ADDRESS, $address, $comparison);
+    }
+
+    /**
+     * Filter the query on the owner column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByOwner(1234); // WHERE owner = 1234
+     * $query->filterByOwner(array(12, 34)); // WHERE owner IN (12, 34)
+     * $query->filterByOwner(array('min' => 12)); // WHERE owner > 12
+     * </code>
+     *
+     * @see       filterByUserRelatedByOwner()
+     *
+     * @param     mixed $owner The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByOwner($owner = null, $comparison = null)
+    {
+        if (is_array($owner)) {
+            $useMinMax = false;
+            if (isset($owner['min'])) {
+                $this->addUsingAlias(EmailAddressTableMap::COL_OWNER, $owner['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($owner['max'])) {
+                $this->addUsingAlias(EmailAddressTableMap::COL_OWNER, $owner['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(EmailAddressTableMap::COL_OWNER, $owner, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\User object
+     *
+     * @param \Eater\Glim\Model\User|ObjectCollection $user The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByUserRelatedByOwner($user, $comparison = null)
+    {
+        if ($user instanceof \Eater\Glim\Model\User) {
+            return $this
+                ->addUsingAlias(EmailAddressTableMap::COL_OWNER, $user->getId(), $comparison);
+        } elseif ($user instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(EmailAddressTableMap::COL_OWNER, $user->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByUserRelatedByOwner() only accepts arguments of type \Eater\Glim\Model\User or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the UserRelatedByOwner relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function joinUserRelatedByOwner($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('UserRelatedByOwner');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'UserRelatedByOwner');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the UserRelatedByOwner relation User object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\UserQuery A secondary query class using the current class as primary query
+     */
+    public function useUserRelatedByOwnerQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinUserRelatedByOwner($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'UserRelatedByOwner', '\Eater\Glim\Model\UserQuery');
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\User object
+     *
+     * @param \Eater\Glim\Model\User|ObjectCollection $user the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByUserRelatedByEmail($user, $comparison = null)
+    {
+        if ($user instanceof \Eater\Glim\Model\User) {
+            return $this
+                ->addUsingAlias(EmailAddressTableMap::COL_ID, $user->getEmail(), $comparison);
+        } elseif ($user instanceof ObjectCollection) {
+            return $this
+                ->useUserRelatedByEmailQuery()
+                ->filterByPrimaryKeys($user->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByUserRelatedByEmail() only accepts arguments of type \Eater\Glim\Model\User or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the UserRelatedByEmail relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function joinUserRelatedByEmail($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('UserRelatedByEmail');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'UserRelatedByEmail');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the UserRelatedByEmail relation User object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\UserQuery A secondary query class using the current class as primary query
+     */
+    public function useUserRelatedByEmailQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinUserRelatedByEmail($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'UserRelatedByEmail', '\Eater\Glim\Model\UserQuery');
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailMessage object
+     *
+     * @param \Eater\Glim\Model\EmailMessage|ObjectCollection $emailMessage the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByEmailMessageRelatedByRecipient($emailMessage, $comparison = null)
+    {
+        if ($emailMessage instanceof \Eater\Glim\Model\EmailMessage) {
+            return $this
+                ->addUsingAlias(EmailAddressTableMap::COL_ID, $emailMessage->getRecipient(), $comparison);
+        } elseif ($emailMessage instanceof ObjectCollection) {
+            return $this
+                ->useEmailMessageRelatedByRecipientQuery()
+                ->filterByPrimaryKeys($emailMessage->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByEmailMessageRelatedByRecipient() only accepts arguments of type \Eater\Glim\Model\EmailMessage or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the EmailMessageRelatedByRecipient relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function joinEmailMessageRelatedByRecipient($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('EmailMessageRelatedByRecipient');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'EmailMessageRelatedByRecipient');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the EmailMessageRelatedByRecipient relation EmailMessage object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailMessageQuery A secondary query class using the current class as primary query
+     */
+    public function useEmailMessageRelatedByRecipientQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinEmailMessageRelatedByRecipient($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'EmailMessageRelatedByRecipient', '\Eater\Glim\Model\EmailMessageQuery');
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailMessage object
+     *
+     * @param \Eater\Glim\Model\EmailMessage|ObjectCollection $emailMessage the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function filterByEmailMessageRelatedBySender($emailMessage, $comparison = null)
+    {
+        if ($emailMessage instanceof \Eater\Glim\Model\EmailMessage) {
+            return $this
+                ->addUsingAlias(EmailAddressTableMap::COL_ID, $emailMessage->getSender(), $comparison);
+        } elseif ($emailMessage instanceof ObjectCollection) {
+            return $this
+                ->useEmailMessageRelatedBySenderQuery()
+                ->filterByPrimaryKeys($emailMessage->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByEmailMessageRelatedBySender() only accepts arguments of type \Eater\Glim\Model\EmailMessage or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the EmailMessageRelatedBySender relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function joinEmailMessageRelatedBySender($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('EmailMessageRelatedBySender');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'EmailMessageRelatedBySender');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the EmailMessageRelatedBySender relation EmailMessage object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailMessageQuery A secondary query class using the current class as primary query
+     */
+    public function useEmailMessageRelatedBySenderQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinEmailMessageRelatedBySender($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'EmailMessageRelatedBySender', '\Eater\Glim\Model\EmailMessageQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildEmailAddress $emailAddress Object to remove from the list of results
+     *
+     * @return $this|ChildEmailAddressQuery The current query, for fluid interface
+     */
+    public function prune($emailAddress = null)
+    {
+        if ($emailAddress) {
+            $this->addUsingAlias(EmailAddressTableMap::COL_ID, $emailAddress->getId(), Criteria::NOT_EQUAL);
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the email_address table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailAddressTableMap::DATABASE_NAME);
+        }
+
+        // use transaction because $criteria could contain info
+        // for more than one table or we could emulating ON DELETE CASCADE, etc.
+        return $con->transaction(function () use ($con) {
+            $affectedRows = 0; // initialize var to track total num of affected rows
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            EmailAddressTableMap::clearInstancePool();
+            EmailAddressTableMap::clearRelatedInstancePool();
+
+            return $affectedRows;
+        });
+    }
+
+    /**
+     * Performs a DELETE on the database based on the current ModelCriteria
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                         if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public function delete(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailAddressTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(EmailAddressTableMap::DATABASE_NAME);
+
+        // use transaction because $criteria could contain info
+        // for more than one table or we could emulating ON DELETE CASCADE, etc.
+        return $con->transaction(function () use ($con, $criteria) {
+            $affectedRows = 0; // initialize var to track total num of affected rows
+
+            EmailAddressTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            EmailAddressTableMap::clearRelatedInstancePool();
+
+            return $affectedRows;
+        });
+    }
+
+} // EmailAddressQuery

src/Model/Base/EmailMessageQuery.php

@@ -0,0 +1,545 @@
+<?php
+
+namespace Eater\Glim\Model\Base;
+
+use \Exception;
+use Eater\Glim\Model\EmailMessage as ChildEmailMessage;
+use Eater\Glim\Model\EmailMessageQuery as ChildEmailMessageQuery;
+use Eater\Glim\Model\Map\EmailMessageTableMap;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\ModelCriteria;
+use Propel\Runtime\ActiveQuery\ModelJoin;
+use Propel\Runtime\Collection\ObjectCollection;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\Exception\LogicException;
+use Propel\Runtime\Exception\PropelException;
+
+/**
+ * Base class that represents a query for the 'email_message' table.
+ *
+ *
+ *
+ * @method     ChildEmailMessageQuery orderByRecipient($order = Criteria::ASC) Order by the recipient column
+ * @method     ChildEmailMessageQuery orderBySender($order = Criteria::ASC) Order by the sender column
+ * @method     ChildEmailMessageQuery orderByContents($order = Criteria::ASC) Order by the contents column
+ * @method     ChildEmailMessageQuery orderBySubject($order = Criteria::ASC) Order by the subject column
+ *
+ * @method     ChildEmailMessageQuery groupByRecipient() Group by the recipient column
+ * @method     ChildEmailMessageQuery groupBySender() Group by the sender column
+ * @method     ChildEmailMessageQuery groupByContents() Group by the contents column
+ * @method     ChildEmailMessageQuery groupBySubject() Group by the subject column
+ *
+ * @method     ChildEmailMessageQuery leftJoin($relation) Adds a LEFT JOIN clause to the query
+ * @method     ChildEmailMessageQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
+ * @method     ChildEmailMessageQuery innerJoin($relation) Adds a INNER JOIN clause to the query
+ *
+ * @method     ChildEmailMessageQuery leftJoinRecipientEmailAddress($relationAlias = null) Adds a LEFT JOIN clause to the query using the RecipientEmailAddress relation
+ * @method     ChildEmailMessageQuery rightJoinRecipientEmailAddress($relationAlias = null) Adds a RIGHT JOIN clause to the query using the RecipientEmailAddress relation
+ * @method     ChildEmailMessageQuery innerJoinRecipientEmailAddress($relationAlias = null) Adds a INNER JOIN clause to the query using the RecipientEmailAddress relation
+ *
+ * @method     ChildEmailMessageQuery leftJoinSenderEmailAddress($relationAlias = null) Adds a LEFT JOIN clause to the query using the SenderEmailAddress relation
+ * @method     ChildEmailMessageQuery rightJoinSenderEmailAddress($relationAlias = null) Adds a RIGHT JOIN clause to the query using the SenderEmailAddress relation
+ * @method     ChildEmailMessageQuery innerJoinSenderEmailAddress($relationAlias = null) Adds a INNER JOIN clause to the query using the SenderEmailAddress relation
+ *
+ * @method     \Eater\Glim\Model\EmailAddressQuery endUse() Finalizes a secondary criteria and merges it with its primary Criteria
+ *
+ * @method     ChildEmailMessage findOne(ConnectionInterface $con = null) Return the first ChildEmailMessage matching the query
+ * @method     ChildEmailMessage findOneOrCreate(ConnectionInterface $con = null) Return the first ChildEmailMessage matching the query, or a new ChildEmailMessage object populated from the query conditions when no match is found
+ *
+ * @method     ChildEmailMessage findOneByRecipient(int $recipient) Return the first ChildEmailMessage filtered by the recipient column
+ * @method     ChildEmailMessage findOneBySender(int $sender) Return the first ChildEmailMessage filtered by the sender column
+ * @method     ChildEmailMessage findOneByContents(string $contents) Return the first ChildEmailMessage filtered by the contents column
+ * @method     ChildEmailMessage findOneBySubject(string $subject) Return the first ChildEmailMessage filtered by the subject column *
+
+ * @method     ChildEmailMessage requirePk($key, ConnectionInterface $con = null) Return the ChildEmailMessage by primary key and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailMessage requireOne(ConnectionInterface $con = null) Return the first ChildEmailMessage matching the query and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ *
+ * @method     ChildEmailMessage requireOneByRecipient(int $recipient) Return the first ChildEmailMessage filtered by the recipient column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailMessage requireOneBySender(int $sender) Return the first ChildEmailMessage filtered by the sender column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailMessage requireOneByContents(string $contents) Return the first ChildEmailMessage filtered by the contents column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildEmailMessage requireOneBySubject(string $subject) Return the first ChildEmailMessage filtered by the subject column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ *
+ * @method     ChildEmailMessage[]|ObjectCollection find(ConnectionInterface $con = null) Return ChildEmailMessage objects based on current ModelCriteria
+ * @method     ChildEmailMessage[]|ObjectCollection findByRecipient(int $recipient) Return ChildEmailMessage objects filtered by the recipient column
+ * @method     ChildEmailMessage[]|ObjectCollection findBySender(int $sender) Return ChildEmailMessage objects filtered by the sender column
+ * @method     ChildEmailMessage[]|ObjectCollection findByContents(string $contents) Return ChildEmailMessage objects filtered by the contents column
+ * @method     ChildEmailMessage[]|ObjectCollection findBySubject(string $subject) Return ChildEmailMessage objects filtered by the subject column
+ * @method     ChildEmailMessage[]|\Propel\Runtime\Util\PropelModelPager paginate($page = 1, $maxPerPage = 10, ConnectionInterface $con = null) Issue a SELECT query based on the current ModelCriteria and uses a page and a maximum number of results per page to compute an offset and a limit
+ *
+ */
+abstract class EmailMessageQuery extends ModelCriteria
+{
+    protected $entityNotFoundExceptionClass = '\\Propel\\Runtime\\Exception\\EntityNotFoundException';
+
+    /**
+     * Initializes internal state of \Eater\Glim\Model\Base\EmailMessageQuery object.
+     *
+     * @param     string $dbName The database name
+     * @param     string $modelName The phpName of a model, e.g. 'Book'
+     * @param     string $modelAlias The alias for the model in this query, e.g. 'b'
+     */
+    public function __construct($dbName = 'default', $modelName = '\\Eater\\Glim\\Model\\EmailMessage', $modelAlias = null)
+    {
+        parent::__construct($dbName, $modelName, $modelAlias);
+    }
+
+    /**
+     * Returns a new ChildEmailMessageQuery object.
+     *
+     * @param     string $modelAlias The alias of a model in the query
+     * @param     Criteria $criteria Optional Criteria to build the query from
+     *
+     * @return ChildEmailMessageQuery
+     */
+    public static function create($modelAlias = null, Criteria $criteria = null)
+    {
+        if ($criteria instanceof ChildEmailMessageQuery) {
+            return $criteria;
+        }
+        $query = new ChildEmailMessageQuery();
+        if (null !== $modelAlias) {
+            $query->setModelAlias($modelAlias);
+        }
+        if ($criteria instanceof Criteria) {
+            $query->mergeWith($criteria);
+        }
+
+        return $query;
+    }
+
+    /**
+     * Find object by primary key.
+     * Propel uses the instance pool to skip the database if the object exists.
+     * Go fast if the query is untouched.
+     *
+     * <code>
+     * $obj  = $c->findPk(12, $con);
+     * </code>
+     *
+     * @param mixed $key Primary key to use for the query
+     * @param ConnectionInterface $con an optional connection object
+     *
+     * @return ChildEmailMessage|array|mixed the result, formatted by the current formatter
+     */
+    public function findPk($key, ConnectionInterface $con = null)
+    {
+        throw new LogicException('The EmailMessage object has no primary key');
+    }
+
+    /**
+     * Find objects by primary key
+     * <code>
+     * $objs = $c->findPks(array(array(12, 56), array(832, 123), array(123, 456)), $con);
+     * </code>
+     * @param     array $keys Primary keys to use for the query
+     * @param     ConnectionInterface $con an optional connection object
+     *
+     * @return ObjectCollection|array|mixed the list of results, formatted by the current formatter
+     */
+    public function findPks($keys, ConnectionInterface $con = null)
+    {
+        throw new LogicException('The EmailMessage object has no primary key');
+    }
+
+    /**
+     * Filter the query by primary key
+     *
+     * @param     mixed $key Primary key to use for the query
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKey($key)
+    {
+        throw new LogicException('The EmailMessage object has no primary key');
+    }
+
+    /**
+     * Filter the query by a list of primary keys
+     *
+     * @param     array $keys The list of primary key to use for the query
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterByPrimaryKeys($keys)
+    {
+        throw new LogicException('The EmailMessage object has no primary key');
+    }
+
+    /**
+     * Filter the query on the recipient column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByRecipient(1234); // WHERE recipient = 1234
+     * $query->filterByRecipient(array(12, 34)); // WHERE recipient IN (12, 34)
+     * $query->filterByRecipient(array('min' => 12)); // WHERE recipient > 12
+     * </code>
+     *
+     * @see       filterByRecipientEmailAddress()
+     *
+     * @param     mixed $recipient The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterByRecipient($recipient = null, $comparison = null)
+    {
+        if (is_array($recipient)) {
+            $useMinMax = false;
+            if (isset($recipient['min'])) {
+                $this->addUsingAlias(EmailMessageTableMap::COL_RECIPIENT, $recipient['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($recipient['max'])) {
+                $this->addUsingAlias(EmailMessageTableMap::COL_RECIPIENT, $recipient['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(EmailMessageTableMap::COL_RECIPIENT, $recipient, $comparison);
+    }
+
+    /**
+     * Filter the query on the sender column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterBySender(1234); // WHERE sender = 1234
+     * $query->filterBySender(array(12, 34)); // WHERE sender IN (12, 34)
+     * $query->filterBySender(array('min' => 12)); // WHERE sender > 12
+     * </code>
+     *
+     * @see       filterBySenderEmailAddress()
+     *
+     * @param     mixed $sender The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterBySender($sender = null, $comparison = null)
+    {
+        if (is_array($sender)) {
+            $useMinMax = false;
+            if (isset($sender['min'])) {
+                $this->addUsingAlias(EmailMessageTableMap::COL_SENDER, $sender['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($sender['max'])) {
+                $this->addUsingAlias(EmailMessageTableMap::COL_SENDER, $sender['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(EmailMessageTableMap::COL_SENDER, $sender, $comparison);
+    }
+
+    /**
+     * Filter the query on the contents column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByContents('fooValue');   // WHERE contents = 'fooValue'
+     * $query->filterByContents('%fooValue%'); // WHERE contents LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $contents The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterByContents($contents = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($contents)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $contents)) {
+                $contents = str_replace('*', '%', $contents);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(EmailMessageTableMap::COL_CONTENTS, $contents, $comparison);
+    }
+
+    /**
+     * Filter the query on the subject column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterBySubject('fooValue');   // WHERE subject = 'fooValue'
+     * $query->filterBySubject('%fooValue%'); // WHERE subject LIKE '%fooValue%'
+     * </code>
+     *
+     * @param     string $subject The value to use as filter.
+     *              Accepts wildcards (* and % trigger a LIKE)
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterBySubject($subject = null, $comparison = null)
+    {
+        if (null === $comparison) {
+            if (is_array($subject)) {
+                $comparison = Criteria::IN;
+            } elseif (preg_match('/[\%\*]/', $subject)) {
+                $subject = str_replace('*', '%', $subject);
+                $comparison = Criteria::LIKE;
+            }
+        }
+
+        return $this->addUsingAlias(EmailMessageTableMap::COL_SUBJECT, $subject, $comparison);
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailAddress object
+     *
+     * @param \Eater\Glim\Model\EmailAddress|ObjectCollection $emailAddress The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterByRecipientEmailAddress($emailAddress, $comparison = null)
+    {
+        if ($emailAddress instanceof \Eater\Glim\Model\EmailAddress) {
+            return $this
+                ->addUsingAlias(EmailMessageTableMap::COL_RECIPIENT, $emailAddress->getId(), $comparison);
+        } elseif ($emailAddress instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(EmailMessageTableMap::COL_RECIPIENT, $emailAddress->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByRecipientEmailAddress() only accepts arguments of type \Eater\Glim\Model\EmailAddress or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the RecipientEmailAddress relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function joinRecipientEmailAddress($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('RecipientEmailAddress');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'RecipientEmailAddress');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the RecipientEmailAddress relation EmailAddress object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailAddressQuery A secondary query class using the current class as primary query
+     */
+    public function useRecipientEmailAddressQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinRecipientEmailAddress($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'RecipientEmailAddress', '\Eater\Glim\Model\EmailAddressQuery');
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailAddress object
+     *
+     * @param \Eater\Glim\Model\EmailAddress|ObjectCollection $emailAddress The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function filterBySenderEmailAddress($emailAddress, $comparison = null)
+    {
+        if ($emailAddress instanceof \Eater\Glim\Model\EmailAddress) {
+            return $this
+                ->addUsingAlias(EmailMessageTableMap::COL_SENDER, $emailAddress->getId(), $comparison);
+        } elseif ($emailAddress instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(EmailMessageTableMap::COL_SENDER, $emailAddress->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterBySenderEmailAddress() only accepts arguments of type \Eater\Glim\Model\EmailAddress or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the SenderEmailAddress relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function joinSenderEmailAddress($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('SenderEmailAddress');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'SenderEmailAddress');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the SenderEmailAddress relation EmailAddress object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailAddressQuery A secondary query class using the current class as primary query
+     */
+    public function useSenderEmailAddressQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinSenderEmailAddress($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'SenderEmailAddress', '\Eater\Glim\Model\EmailAddressQuery');
+    }
+
+    /**
+     * Exclude object from result
+     *
+     * @param   ChildEmailMessage $emailMessage Object to remove from the list of results
+     *
+     * @return $this|ChildEmailMessageQuery The current query, for fluid interface
+     */
+    public function prune($emailMessage = null)
+    {
+        if ($emailMessage) {
+            throw new LogicException('EmailMessage object has no primary key');
+
+        }
+
+        return $this;
+    }
+
+    /**
+     * Deletes all rows from the email_message table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public function doDeleteAll(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailMessageTableMap::DATABASE_NAME);
+        }
+
+        // use transaction because $criteria could contain info
+        // for more than one table or we could emulating ON DELETE CASCADE, etc.
+        return $con->transaction(function () use ($con) {
+            $affectedRows = 0; // initialize var to track total num of affected rows
+            $affectedRows += parent::doDeleteAll($con);
+            // Because this db requires some delete cascade/set null emulation, we have to
+            // clear the cached instance *after* the emulation has happened (since
+            // instances get re-added by the select statement contained therein).
+            EmailMessageTableMap::clearInstancePool();
+            EmailMessageTableMap::clearRelatedInstancePool();
+
+            return $affectedRows;
+        });
+    }
+
+    /**
+     * Performs a DELETE on the database based on the current ModelCriteria
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                         if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public function delete(ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailMessageTableMap::DATABASE_NAME);
+        }
+
+        $criteria = $this;
+
+        // Set the correct dbName
+        $criteria->setDbName(EmailMessageTableMap::DATABASE_NAME);
+
+        // use transaction because $criteria could contain info
+        // for more than one table or we could emulating ON DELETE CASCADE, etc.
+        return $con->transaction(function () use ($con, $criteria) {
+            $affectedRows = 0; // initialize var to track total num of affected rows
+
+            EmailMessageTableMap::removeInstanceFromPool($criteria);
+
+            $affectedRows += ModelCriteria::delete($con);
+            EmailMessageTableMap::clearRelatedInstancePool();
+
+            return $affectedRows;
+        });
+    }
+
+} // EmailMessageQuery

src/Model/Base/Invite.php

@@ -21,7 +21,7 @@ use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 
 /**
- * Base class that represents a row from the 'Invite' table.
+ * Base class that represents a row from the 'invite' table.
  *
  *
  *
@@ -679,7 +679,7 @@ abstract class Invite implements ActiveRecordInterface
         }
 
         $sql = sprintf(
-            'INSERT INTO Invite (%s) VALUES (%s)',
+            'INSERT INTO invite (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
@@ -815,7 +815,7 @@ abstract class Invite implements ActiveRecordInterface
                         $key = 'user';
                         break;
                     case TableMap::TYPE_FIELDNAME:
-                        $key = 'User';
+                        $key = 'user';
                         break;
                     default:
                         $key = 'User';

src/Model/Base/InviteQuery.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 
 /**
- * Base class that represents a query for the 'Invite' table.
+ * Base class that represents a query for the 'invite' table.
  *
  *
  *
@@ -148,7 +148,7 @@ abstract class InviteQuery extends ModelCriteria
      */
     protected function findPkSimple($key, ConnectionInterface $con)
     {
-        $sql = 'SELECT id, invite, owner FROM Invite WHERE id = :p0';
+        $sql = 'SELECT id, invite, owner FROM invite WHERE id = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -445,7 +445,7 @@ abstract class InviteQuery extends ModelCriteria
     }
 
     /**
-     * Deletes all rows from the Invite table.
+     * Deletes all rows from the invite table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Base/Server.php

@@ -19,7 +19,7 @@ use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 
 /**
- * Base class that represents a row from the 'Server' table.
+ * Base class that represents a row from the 'server' table.
  *
  *
  *
@@ -1238,7 +1238,7 @@ abstract class Server implements ActiveRecordInterface
         }
 
         $sql = sprintf(
-            'INSERT INTO Server (%s) VALUES (%s)',
+            'INSERT INTO server (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );

src/Model/Base/ServerQuery.php

@@ -15,7 +15,7 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 
 /**
- * Base class that represents a query for the 'Server' table.
+ * Base class that represents a query for the 'server' table.
  *
  *
  *
@@ -201,7 +201,7 @@ abstract class ServerQuery extends ModelCriteria
      */
     protected function findPkSimple($key, ConnectionInterface $con)
     {
-        $sql = 'SELECT id, fqdn, fingerprint, public_key, certificate, location, speed, external_ip, internal_ip, netmask, first_dns, second_dns, port, protocol, status FROM Server WHERE id = :p0';
+        $sql = 'SELECT id, fqdn, fingerprint, public_key, certificate, location, speed, external_ip, internal_ip, netmask, first_dns, second_dns, port, protocol, status FROM server WHERE id = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -799,7 +799,7 @@ abstract class ServerQuery extends ModelCriteria
     }
 
     /**
-     * Deletes all rows from the Server table.
+     * Deletes all rows from the server table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Base/User.php

@@ -6,6 +6,8 @@ use \Exception;
 use \PDO;
 use Eater\Glim\Model\Certificate as ChildCertificate;
 use Eater\Glim\Model\CertificateQuery as ChildCertificateQuery;
+use Eater\Glim\Model\EmailAddress as ChildEmailAddress;
+use Eater\Glim\Model\EmailAddressQuery as ChildEmailAddressQuery;
 use Eater\Glim\Model\Invite as ChildInvite;
 use Eater\Glim\Model\InviteQuery as ChildInviteQuery;
 use Eater\Glim\Model\User as ChildUser;
@@ -25,7 +27,7 @@ use Propel\Runtime\Map\TableMap;
 use Propel\Runtime\Parser\AbstractParser;
 
 /**
- * Base class that represents a row from the 'User' table.
+ * Base class that represents a row from the 'user' table.
  *
  *
  *
@@ -84,6 +86,12 @@ abstract class User implements ActiveRecordInterface
      */
     protected $username;
 
+    /**
+     * The value for the email field.
+     * @var        int
+     */
+    protected $email;
+
     /**
      * The value for the password field.
      * @var        string
@@ -111,6 +119,17 @@ abstract class User implements ActiveRecordInterface
      */
     protected $used_invites;
 
+    /**
+     * @var        ChildEmailAddress
+     */
+    protected $aEmailAddressRelatedByEmail;
+
+    /**
+     * @var        ObjectCollection|ChildEmailAddress[] Collection to store aggregation of ChildEmailAddress objects.
+     */
+    protected $collEmailAddressesRelatedByOwner;
+    protected $collEmailAddressesRelatedByOwnerPartial;
+
     /**
      * @var        ObjectCollection|ChildCertificate[] Collection to store aggregation of ChildCertificate objects.
      */
@@ -131,6 +150,12 @@ abstract class User implements ActiveRecordInterface
      */
     protected $alreadyInSave = false;
 
+    /**
+     * An array of objects scheduled for deletion.
+     * @var ObjectCollection|ChildEmailAddress[]
+     */
+    protected $emailAddressesRelatedByOwnerScheduledForDeletion = null;
+
     /**
      * An array of objects scheduled for deletion.
      * @var ObjectCollection|ChildCertificate[]
@@ -406,6 +431,16 @@ abstract class User implements ActiveRecordInterface
         return $this->username;
     }
 
+    /**
+     * Get the [email] column value.
+     *
+     * @return int
+     */
+    public function getEmail()
+    {
+        return $this->email;
+    }
+
     /**
      * Get the [password] column value.
      *
@@ -516,6 +551,30 @@ abstract class User implements ActiveRecordInterface
         return $this;
     } // setUsername()
 
+    /**
+     * Set the value of [email] column.
+     *
+     * @param int $v new value
+     * @return $this|\Eater\Glim\Model\User The current object (for fluent API support)
+     */
+    public function setEmail($v)
+    {
+        if ($v !== null) {
+            $v = (int) $v;
+        }
+
+        if ($this->email !== $v) {
+            $this->email = $v;
+            $this->modifiedColumns[UserTableMap::COL_EMAIL] = true;
+        }
+
+        if ($this->aEmailAddressRelatedByEmail !== null && $this->aEmailAddressRelatedByEmail->getId() !== $v) {
+            $this->aEmailAddressRelatedByEmail = null;
+        }
+
+        return $this;
+    } // setEmail()
+
     /**
      * Set the value of [password] column.
      *
@@ -665,16 +724,19 @@ abstract class User implements ActiveRecordInterface
             $col = $row[TableMap::TYPE_NUM == $indexType ? 2 + $startcol : UserTableMap::translateFieldName('Username', TableMap::TYPE_PHPNAME, $indexType)];
             $this->username = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : UserTableMap::translateFieldName('Password', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 3 + $startcol : UserTableMap::translateFieldName('Email', TableMap::TYPE_PHPNAME, $indexType)];
+            $this->email = (null !== $col) ? (int) $col : null;
+
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : UserTableMap::translateFieldName('Password', TableMap::TYPE_PHPNAME, $indexType)];
             $this->password = (null !== $col) ? (string) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 4 + $startcol : UserTableMap::translateFieldName('Superuser', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : UserTableMap::translateFieldName('Superuser', TableMap::TYPE_PHPNAME, $indexType)];
             $this->superuser = (null !== $col) ? (boolean) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 5 + $startcol : UserTableMap::translateFieldName('MaxInvites', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : UserTableMap::translateFieldName('MaxInvites', TableMap::TYPE_PHPNAME, $indexType)];
             $this->max_invites = (null !== $col) ? (int) $col : null;
 
-            $col = $row[TableMap::TYPE_NUM == $indexType ? 6 + $startcol : UserTableMap::translateFieldName('UsedInvites', TableMap::TYPE_PHPNAME, $indexType)];
+            $col = $row[TableMap::TYPE_NUM == $indexType ? 7 + $startcol : UserTableMap::translateFieldName('UsedInvites', TableMap::TYPE_PHPNAME, $indexType)];
             $this->used_invites = (null !== $col) ? (int) $col : null;
             $this->resetModified();
 
@@ -684,7 +746,7 @@ abstract class User implements ActiveRecordInterface
                 $this->ensureConsistency();
             }
 
-            return $startcol + 7; // 7 = UserTableMap::NUM_HYDRATE_COLUMNS.
+            return $startcol + 8; // 8 = UserTableMap::NUM_HYDRATE_COLUMNS.
 
         } catch (Exception $e) {
             throw new PropelException(sprintf('Error populating %s object', '\\Eater\\Glim\\Model\\User'), 0, $e);
@@ -706,6 +768,9 @@ abstract class User implements ActiveRecordInterface
      */
     public function ensureConsistency()
     {
+        if ($this->aEmailAddressRelatedByEmail !== null && $this->email !== $this->aEmailAddressRelatedByEmail->getId()) {
+            $this->aEmailAddressRelatedByEmail = null;
+        }
     } // ensureConsistency
 
     /**
@@ -745,6 +810,9 @@ abstract class User implements ActiveRecordInterface
 
         if ($deep) {  // also de-associate any related objects?
 
+            $this->aEmailAddressRelatedByEmail = null;
+            $this->collEmailAddressesRelatedByOwner = null;
+
             $this->collCertificates = null;
 
             $this->collInvites = null;
@@ -848,6 +916,18 @@ abstract class User implements ActiveRecordInterface
         if (!$this->alreadyInSave) {
             $this->alreadyInSave = true;
 
+            // We call the save method on the following object(s) if they
+            // were passed to this object by their corresponding set
+            // method.  This object relates to these object(s) by a
+            // foreign key reference.
+
+            if ($this->aEmailAddressRelatedByEmail !== null) {
+                if ($this->aEmailAddressRelatedByEmail->isModified() || $this->aEmailAddressRelatedByEmail->isNew()) {
+                    $affectedRows += $this->aEmailAddressRelatedByEmail->save($con);
+                }
+                $this->setEmailAddressRelatedByEmail($this->aEmailAddressRelatedByEmail);
+            }
+
             if ($this->isNew() || $this->isModified()) {
                 // persist changes
                 if ($this->isNew()) {
@@ -859,6 +939,24 @@ abstract class User implements ActiveRecordInterface
                 $this->resetModified();
             }
 
+            if ($this->emailAddressesRelatedByOwnerScheduledForDeletion !== null) {
+                if (!$this->emailAddressesRelatedByOwnerScheduledForDeletion->isEmpty()) {
+                    foreach ($this->emailAddressesRelatedByOwnerScheduledForDeletion as $emailAddressRelatedByOwner) {
+                        // need to save related object because we set the relation to null
+                        $emailAddressRelatedByOwner->save($con);
+                    }
+                    $this->emailAddressesRelatedByOwnerScheduledForDeletion = null;
+                }
+            }
+
+            if ($this->collEmailAddressesRelatedByOwner !== null) {
+                foreach ($this->collEmailAddressesRelatedByOwner as $referrerFK) {
+                    if (!$referrerFK->isDeleted() && ($referrerFK->isNew() || $referrerFK->isModified())) {
+                        $affectedRows += $referrerFK->save($con);
+                    }
+                }
+            }
+
             if ($this->certificatesScheduledForDeletion !== null) {
                 if (!$this->certificatesScheduledForDeletion->isEmpty()) {
                     foreach ($this->certificatesScheduledForDeletion as $certificate) {
@@ -930,6 +1028,9 @@ abstract class User implements ActiveRecordInterface
         if ($this->isColumnModified(UserTableMap::COL_USERNAME)) {
             $modifiedColumns[':p' . $index++]  = 'username';
         }
+        if ($this->isColumnModified(UserTableMap::COL_EMAIL)) {
+            $modifiedColumns[':p' . $index++]  = 'email';
+        }
         if ($this->isColumnModified(UserTableMap::COL_PASSWORD)) {
             $modifiedColumns[':p' . $index++]  = 'password';
         }
@@ -944,7 +1045,7 @@ abstract class User implements ActiveRecordInterface
         }
 
         $sql = sprintf(
-            'INSERT INTO User (%s) VALUES (%s)',
+            'INSERT INTO user (%s) VALUES (%s)',
             implode(', ', $modifiedColumns),
             implode(', ', array_keys($modifiedColumns))
         );
@@ -962,6 +1063,9 @@ abstract class User implements ActiveRecordInterface
                     case 'username':
                         $stmt->bindValue($identifier, $this->username, PDO::PARAM_STR);
                         break;
+                    case 'email':
+                        $stmt->bindValue($identifier, $this->email, PDO::PARAM_INT);
+                        break;
                     case 'password':
                         $stmt->bindValue($identifier, $this->password, PDO::PARAM_STR);
                         break;
@@ -1046,15 +1150,18 @@ abstract class User implements ActiveRecordInterface
                 return $this->getUsername();
                 break;
             case 3:
-                return $this->getPassword();
+                return $this->getEmail();
                 break;
             case 4:
-                return $this->getSuperuser();
+                return $this->getPassword();
                 break;
             case 5:
-                return $this->getMaxInvites();
+                return $this->getSuperuser();
                 break;
             case 6:
+                return $this->getMaxInvites();
+                break;
+            case 7:
                 return $this->getUsedInvites();
                 break;
             default:
@@ -1090,10 +1197,11 @@ abstract class User implements ActiveRecordInterface
             $keys[0] => $this->getId(),
             $keys[1] => $this->getMaxKeys(),
             $keys[2] => $this->getUsername(),
-            $keys[3] => $this->getPassword(),
+            $keys[3] => $this->getEmail(),
-            $keys[4] => $this->getSuperuser(),
+            $keys[4] => $this->getPassword(),
-            $keys[5] => $this->getMaxInvites(),
+            $keys[5] => $this->getSuperuser(),
-            $keys[6] => $this->getUsedInvites(),
+            $keys[6] => $this->getMaxInvites(),
+            $keys[7] => $this->getUsedInvites(),
         );
         $virtualColumns = $this->virtualColumns;
         foreach ($virtualColumns as $key => $virtualColumn) {
@@ -1101,6 +1209,36 @@ abstract class User implements ActiveRecordInterface
         }
 
         if ($includeForeignObjects) {
+            if (null !== $this->aEmailAddressRelatedByEmail) {
+
+                switch ($keyType) {
+                    case TableMap::TYPE_CAMELNAME:
+                        $key = 'emailAddress';
+                        break;
+                    case TableMap::TYPE_FIELDNAME:
+                        $key = 'email_address';
+                        break;
+                    default:
+                        $key = 'EmailAddress';
+                }
+
+                $result[$key] = $this->aEmailAddressRelatedByEmail->toArray($keyType, $includeLazyLoadColumns,  $alreadyDumpedObjects, true);
+            }
+            if (null !== $this->collEmailAddressesRelatedByOwner) {
+
+                switch ($keyType) {
+                    case TableMap::TYPE_CAMELNAME:
+                        $key = 'emailAddresses';
+                        break;
+                    case TableMap::TYPE_FIELDNAME:
+                        $key = 'email_addresses';
+                        break;
+                    default:
+                        $key = 'EmailAddresses';
+                }
+
+                $result[$key] = $this->collEmailAddressesRelatedByOwner->toArray(null, false, $keyType, $includeLazyLoadColumns, $alreadyDumpedObjects);
+            }
             if (null !== $this->collCertificates) {
 
                 switch ($keyType) {
@@ -1108,7 +1246,7 @@ abstract class User implements ActiveRecordInterface
                         $key = 'certificates';
                         break;
                     case TableMap::TYPE_FIELDNAME:
-                        $key = 'Certificates';
+                        $key = 'certificates';
                         break;
                     default:
                         $key = 'Certificates';
@@ -1123,7 +1261,7 @@ abstract class User implements ActiveRecordInterface
                         $key = 'invites';
                         break;
                     case TableMap::TYPE_FIELDNAME:
-                        $key = 'Invites';
+                        $key = 'invites';
                         break;
                     default:
                         $key = 'Invites';
@@ -1175,15 +1313,18 @@ abstract class User implements ActiveRecordInterface
                 $this->setUsername($value);
                 break;
             case 3:
-                $this->setPassword($value);
+                $this->setEmail($value);
                 break;
             case 4:
-                $this->setSuperuser($value);
+                $this->setPassword($value);
                 break;
             case 5:
-                $this->setMaxInvites($value);
+                $this->setSuperuser($value);
                 break;
             case 6:
+                $this->setMaxInvites($value);
+                break;
+            case 7:
                 $this->setUsedInvites($value);
                 break;
         } // switch()
@@ -1222,16 +1363,19 @@ abstract class User implements ActiveRecordInterface
             $this->setUsername($arr[$keys[2]]);
         }
         if (array_key_exists($keys[3], $arr)) {
-            $this->setPassword($arr[$keys[3]]);
+            $this->setEmail($arr[$keys[3]]);
         }
         if (array_key_exists($keys[4], $arr)) {
-            $this->setSuperuser($arr[$keys[4]]);
+            $this->setPassword($arr[$keys[4]]);
         }
         if (array_key_exists($keys[5], $arr)) {
-            $this->setMaxInvites($arr[$keys[5]]);
+            $this->setSuperuser($arr[$keys[5]]);
         }
         if (array_key_exists($keys[6], $arr)) {
-            $this->setUsedInvites($arr[$keys[6]]);
+            $this->setMaxInvites($arr[$keys[6]]);
+        }
+        if (array_key_exists($keys[7], $arr)) {
+            $this->setUsedInvites($arr[$keys[7]]);
         }
     }
 
@@ -1283,6 +1427,9 @@ abstract class User implements ActiveRecordInterface
         if ($this->isColumnModified(UserTableMap::COL_USERNAME)) {
             $criteria->add(UserTableMap::COL_USERNAME, $this->username);
         }
+        if ($this->isColumnModified(UserTableMap::COL_EMAIL)) {
+            $criteria->add(UserTableMap::COL_EMAIL, $this->email);
+        }
         if ($this->isColumnModified(UserTableMap::COL_PASSWORD)) {
             $criteria->add(UserTableMap::COL_PASSWORD, $this->password);
         }
@@ -1383,6 +1530,7 @@ abstract class User implements ActiveRecordInterface
     {
         $copyObj->setMaxKeys($this->getMaxKeys());
         $copyObj->setUsername($this->getUsername());
+        $copyObj->setEmail($this->getEmail());
         $copyObj->setPassword($this->getPassword());
         $copyObj->setSuperuser($this->getSuperuser());
         $copyObj->setMaxInvites($this->getMaxInvites());
@@ -1393,6 +1541,12 @@ abstract class User implements ActiveRecordInterface
             // the getter/setter methods for fkey referrer objects.
             $copyObj->setNew(false);
 
+            foreach ($this->getEmailAddressesRelatedByOwner() as $relObj) {
+                if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
+                    $copyObj->addEmailAddressRelatedByOwner($relObj->copy($deepCopy));
+                }
+            }
+
             foreach ($this->getCertificates() as $relObj) {
                 if ($relObj !== $this) {  // ensure that we don't try to copy a reference to ourselves
                     $copyObj->addCertificate($relObj->copy($deepCopy));
@@ -1435,6 +1589,57 @@ abstract class User implements ActiveRecordInterface
         return $copyObj;
     }
 
+    /**
+     * Declares an association between this object and a ChildEmailAddress object.
+     *
+     * @param  ChildEmailAddress $v
+     * @return $this|\Eater\Glim\Model\User The current object (for fluent API support)
+     * @throws PropelException
+     */
+    public function setEmailAddressRelatedByEmail(ChildEmailAddress $v = null)
+    {
+        if ($v === null) {
+            $this->setEmail(NULL);
+        } else {
+            $this->setEmail($v->getId());
+        }
+
+        $this->aEmailAddressRelatedByEmail = $v;
+
+        // Add binding for other direction of this n:n relationship.
+        // If this object has already been added to the ChildEmailAddress object, it will not be re-added.
+        if ($v !== null) {
+            $v->addUserRelatedByEmail($this);
+        }
+
+
+        return $this;
+    }
+
+
+    /**
+     * Get the associated ChildEmailAddress object
+     *
+     * @param  ConnectionInterface $con Optional Connection object.
+     * @return ChildEmailAddress The associated ChildEmailAddress object.
+     * @throws PropelException
+     */
+    public function getEmailAddressRelatedByEmail(ConnectionInterface $con = null)
+    {
+        if ($this->aEmailAddressRelatedByEmail === null && ($this->email !== null)) {
+            $this->aEmailAddressRelatedByEmail = ChildEmailAddressQuery::create()->findPk($this->email, $con);
+            /* The following can be used additionally to
+                guarantee the related object contains a reference
+                to this object.  This level of coupling may, however, be
+                undesirable since it could result in an only partially populated collection
+                in the referenced object.
+                $this->aEmailAddressRelatedByEmail->addUsersRelatedByEmail($this);
+             */
+        }
+
+        return $this->aEmailAddressRelatedByEmail;
+    }
+
 
     /**
      * Initializes a collection based on the name of a relation.
@@ -1446,6 +1651,9 @@ abstract class User implements ActiveRecordInterface
      */
     public function initRelation($relationName)
     {
+        if ('EmailAddressRelatedByOwner' == $relationName) {
+            return $this->initEmailAddressesRelatedByOwner();
+        }
         if ('Certificate' == $relationName) {
             return $this->initCertificates();
         }
@@ -1454,6 +1662,224 @@ abstract class User implements ActiveRecordInterface
         }
     }
 
+    /**
+     * Clears out the collEmailAddressesRelatedByOwner collection
+     *
+     * This does not modify the database; however, it will remove any associated objects, causing
+     * them to be refetched by subsequent calls to accessor method.
+     *
+     * @return void
+     * @see        addEmailAddressesRelatedByOwner()
+     */
+    public function clearEmailAddressesRelatedByOwner()
+    {
+        $this->collEmailAddressesRelatedByOwner = null; // important to set this to NULL since that means it is uninitialized
+    }
+
+    /**
+     * Reset is the collEmailAddressesRelatedByOwner collection loaded partially.
+     */
+    public function resetPartialEmailAddressesRelatedByOwner($v = true)
+    {
+        $this->collEmailAddressesRelatedByOwnerPartial = $v;
+    }
+
+    /**
+     * Initializes the collEmailAddressesRelatedByOwner collection.
+     *
+     * By default this just sets the collEmailAddressesRelatedByOwner collection to an empty array (like clearcollEmailAddressesRelatedByOwner());
+     * however, you may wish to override this method in your stub class to provide setting appropriate
+     * to your application -- for example, setting the initial array to the values stored in database.
+     *
+     * @param      boolean $overrideExisting If set to true, the method call initializes
+     *                                        the collection even if it is not empty
+     *
+     * @return void
+     */
+    public function initEmailAddressesRelatedByOwner($overrideExisting = true)
+    {
+        if (null !== $this->collEmailAddressesRelatedByOwner && !$overrideExisting) {
+            return;
+        }
+        $this->collEmailAddressesRelatedByOwner = new ObjectCollection();
+        $this->collEmailAddressesRelatedByOwner->setModel('\Eater\Glim\Model\EmailAddress');
+    }
+
+    /**
+     * Gets an array of ChildEmailAddress objects which contain a foreign key that references this object.
+     *
+     * If the $criteria is not null, it is used to always fetch the results from the database.
+     * Otherwise the results are fetched from the database the first time, then cached.
+     * Next time the same method is called without $criteria, the cached collection is returned.
+     * If this ChildUser is new, it will return
+     * an empty collection or the current collection; the criteria is ignored on a new object.
+     *
+     * @param      Criteria $criteria optional Criteria object to narrow the query
+     * @param      ConnectionInterface $con optional connection object
+     * @return ObjectCollection|ChildEmailAddress[] List of ChildEmailAddress objects
+     * @throws PropelException
+     */
+    public function getEmailAddressesRelatedByOwner(Criteria $criteria = null, ConnectionInterface $con = null)
+    {
+        $partial = $this->collEmailAddressesRelatedByOwnerPartial && !$this->isNew();
+        if (null === $this->collEmailAddressesRelatedByOwner || null !== $criteria  || $partial) {
+            if ($this->isNew() && null === $this->collEmailAddressesRelatedByOwner) {
+                // return empty collection
+                $this->initEmailAddressesRelatedByOwner();
+            } else {
+                $collEmailAddressesRelatedByOwner = ChildEmailAddressQuery::create(null, $criteria)
+                    ->filterByUserRelatedByOwner($this)
+                    ->find($con);
+
+                if (null !== $criteria) {
+                    if (false !== $this->collEmailAddressesRelatedByOwnerPartial && count($collEmailAddressesRelatedByOwner)) {
+                        $this->initEmailAddressesRelatedByOwner(false);
+
+                        foreach ($collEmailAddressesRelatedByOwner as $obj) {
+                            if (false == $this->collEmailAddressesRelatedByOwner->contains($obj)) {
+                                $this->collEmailAddressesRelatedByOwner->append($obj);
+                            }
+                        }
+
+                        $this->collEmailAddressesRelatedByOwnerPartial = true;
+                    }
+
+                    return $collEmailAddressesRelatedByOwner;
+                }
+
+                if ($partial && $this->collEmailAddressesRelatedByOwner) {
+                    foreach ($this->collEmailAddressesRelatedByOwner as $obj) {
+                        if ($obj->isNew()) {
+                            $collEmailAddressesRelatedByOwner[] = $obj;
+                        }
+                    }
+                }
+
+                $this->collEmailAddressesRelatedByOwner = $collEmailAddressesRelatedByOwner;
+                $this->collEmailAddressesRelatedByOwnerPartial = false;
+            }
+        }
+
+        return $this->collEmailAddressesRelatedByOwner;
+    }
+
+    /**
+     * Sets a collection of ChildEmailAddress objects related by a one-to-many relationship
+     * to the current object.
+     * It will also schedule objects for deletion based on a diff between old objects (aka persisted)
+     * and new objects from the given Propel collection.
+     *
+     * @param      Collection $emailAddressesRelatedByOwner A Propel collection.
+     * @param      ConnectionInterface $con Optional connection object
+     * @return $this|ChildUser The current object (for fluent API support)
+     */
+    public function setEmailAddressesRelatedByOwner(Collection $emailAddressesRelatedByOwner, ConnectionInterface $con = null)
+    {
+        /** @var ChildEmailAddress[] $emailAddressesRelatedByOwnerToDelete */
+        $emailAddressesRelatedByOwnerToDelete = $this->getEmailAddressesRelatedByOwner(new Criteria(), $con)->diff($emailAddressesRelatedByOwner);
+
+
+        $this->emailAddressesRelatedByOwnerScheduledForDeletion = $emailAddressesRelatedByOwnerToDelete;
+
+        foreach ($emailAddressesRelatedByOwnerToDelete as $emailAddressRelatedByOwnerRemoved) {
+            $emailAddressRelatedByOwnerRemoved->setUserRelatedByOwner(null);
+        }
+
+        $this->collEmailAddressesRelatedByOwner = null;
+        foreach ($emailAddressesRelatedByOwner as $emailAddressRelatedByOwner) {
+            $this->addEmailAddressRelatedByOwner($emailAddressRelatedByOwner);
+        }
+
+        $this->collEmailAddressesRelatedByOwner = $emailAddressesRelatedByOwner;
+        $this->collEmailAddressesRelatedByOwnerPartial = false;
+
+        return $this;
+    }
+
+    /**
+     * Returns the number of related EmailAddress objects.
+     *
+     * @param      Criteria $criteria
+     * @param      boolean $distinct
+     * @param      ConnectionInterface $con
+     * @return int             Count of related EmailAddress objects.
+     * @throws PropelException
+     */
+    public function countEmailAddressesRelatedByOwner(Criteria $criteria = null, $distinct = false, ConnectionInterface $con = null)
+    {
+        $partial = $this->collEmailAddressesRelatedByOwnerPartial && !$this->isNew();
+        if (null === $this->collEmailAddressesRelatedByOwner || null !== $criteria || $partial) {
+            if ($this->isNew() && null === $this->collEmailAddressesRelatedByOwner) {
+                return 0;
+            }
+
+            if ($partial && !$criteria) {
+                return count($this->getEmailAddressesRelatedByOwner());
+            }
+
+            $query = ChildEmailAddressQuery::create(null, $criteria);
+            if ($distinct) {
+                $query->distinct();
+            }
+
+            return $query
+                ->filterByUserRelatedByOwner($this)
+                ->count($con);
+        }
+
+        return count($this->collEmailAddressesRelatedByOwner);
+    }
+
+    /**
+     * Method called to associate a ChildEmailAddress object to this object
+     * through the ChildEmailAddress foreign key attribute.
+     *
+     * @param  ChildEmailAddress $l ChildEmailAddress
+     * @return $this|\Eater\Glim\Model\User The current object (for fluent API support)
+     */
+    public function addEmailAddressRelatedByOwner(ChildEmailAddress $l)
+    {
+        if ($this->collEmailAddressesRelatedByOwner === null) {
+            $this->initEmailAddressesRelatedByOwner();
+            $this->collEmailAddressesRelatedByOwnerPartial = true;
+        }
+
+        if (!$this->collEmailAddressesRelatedByOwner->contains($l)) {
+            $this->doAddEmailAddressRelatedByOwner($l);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @param ChildEmailAddress $emailAddressRelatedByOwner The ChildEmailAddress object to add.
+     */
+    protected function doAddEmailAddressRelatedByOwner(ChildEmailAddress $emailAddressRelatedByOwner)
+    {
+        $this->collEmailAddressesRelatedByOwner[]= $emailAddressRelatedByOwner;
+        $emailAddressRelatedByOwner->setUserRelatedByOwner($this);
+    }
+
+    /**
+     * @param  ChildEmailAddress $emailAddressRelatedByOwner The ChildEmailAddress object to remove.
+     * @return $this|ChildUser The current object (for fluent API support)
+     */
+    public function removeEmailAddressRelatedByOwner(ChildEmailAddress $emailAddressRelatedByOwner)
+    {
+        if ($this->getEmailAddressesRelatedByOwner()->contains($emailAddressRelatedByOwner)) {
+            $pos = $this->collEmailAddressesRelatedByOwner->search($emailAddressRelatedByOwner);
+            $this->collEmailAddressesRelatedByOwner->remove($pos);
+            if (null === $this->emailAddressesRelatedByOwnerScheduledForDeletion) {
+                $this->emailAddressesRelatedByOwnerScheduledForDeletion = clone $this->collEmailAddressesRelatedByOwner;
+                $this->emailAddressesRelatedByOwnerScheduledForDeletion->clear();
+            }
+            $this->emailAddressesRelatedByOwnerScheduledForDeletion[]= $emailAddressRelatedByOwner;
+            $emailAddressRelatedByOwner->setUserRelatedByOwner(null);
+        }
+
+        return $this;
+    }
+
     /**
      * Clears out the collCertificates collection
      *
@@ -1897,9 +2323,13 @@ abstract class User implements ActiveRecordInterface
      */
     public function clear()
     {
+        if (null !== $this->aEmailAddressRelatedByEmail) {
+            $this->aEmailAddressRelatedByEmail->removeUserRelatedByEmail($this);
+        }
         $this->id = null;
         $this->max_keys = null;
         $this->username = null;
+        $this->email = null;
         $this->password = null;
         $this->superuser = null;
         $this->max_invites = null;
@@ -1923,6 +2353,11 @@ abstract class User implements ActiveRecordInterface
     public function clearAllReferences($deep = false)
     {
         if ($deep) {
+            if ($this->collEmailAddressesRelatedByOwner) {
+                foreach ($this->collEmailAddressesRelatedByOwner as $o) {
+                    $o->clearAllReferences($deep);
+                }
+            }
             if ($this->collCertificates) {
                 foreach ($this->collCertificates as $o) {
                     $o->clearAllReferences($deep);
@@ -1935,8 +2370,10 @@ abstract class User implements ActiveRecordInterface
             }
         } // if ($deep)
 
+        $this->collEmailAddressesRelatedByOwner = null;
         $this->collCertificates = null;
         $this->collInvites = null;
+        $this->aEmailAddressRelatedByEmail = null;
     }
 
     /**

src/Model/Base/UserQuery.php

@@ -16,13 +16,14 @@ use Propel\Runtime\Connection\ConnectionInterface;
 use Propel\Runtime\Exception\PropelException;
 
 /**
- * Base class that represents a query for the 'User' table.
+ * Base class that represents a query for the 'user' table.
  *
  *
  *
  * @method     ChildUserQuery orderById($order = Criteria::ASC) Order by the id column
  * @method     ChildUserQuery orderByMaxKeys($order = Criteria::ASC) Order by the max_keys column
  * @method     ChildUserQuery orderByUsername($order = Criteria::ASC) Order by the username column
+ * @method     ChildUserQuery orderByEmail($order = Criteria::ASC) Order by the email column
  * @method     ChildUserQuery orderByPassword($order = Criteria::ASC) Order by the password column
  * @method     ChildUserQuery orderBySuperuser($order = Criteria::ASC) Order by the superuser column
  * @method     ChildUserQuery orderByMaxInvites($order = Criteria::ASC) Order by the max_invites column
@@ -31,6 +32,7 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUserQuery groupById() Group by the id column
  * @method     ChildUserQuery groupByMaxKeys() Group by the max_keys column
  * @method     ChildUserQuery groupByUsername() Group by the username column
+ * @method     ChildUserQuery groupByEmail() Group by the email column
  * @method     ChildUserQuery groupByPassword() Group by the password column
  * @method     ChildUserQuery groupBySuperuser() Group by the superuser column
  * @method     ChildUserQuery groupByMaxInvites() Group by the max_invites column
@@ -40,6 +42,14 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUserQuery rightJoin($relation) Adds a RIGHT JOIN clause to the query
  * @method     ChildUserQuery innerJoin($relation) Adds a INNER JOIN clause to the query
  *
+ * @method     ChildUserQuery leftJoinEmailAddressRelatedByEmail($relationAlias = null) Adds a LEFT JOIN clause to the query using the EmailAddressRelatedByEmail relation
+ * @method     ChildUserQuery rightJoinEmailAddressRelatedByEmail($relationAlias = null) Adds a RIGHT JOIN clause to the query using the EmailAddressRelatedByEmail relation
+ * @method     ChildUserQuery innerJoinEmailAddressRelatedByEmail($relationAlias = null) Adds a INNER JOIN clause to the query using the EmailAddressRelatedByEmail relation
+ *
+ * @method     ChildUserQuery leftJoinEmailAddressRelatedByOwner($relationAlias = null) Adds a LEFT JOIN clause to the query using the EmailAddressRelatedByOwner relation
+ * @method     ChildUserQuery rightJoinEmailAddressRelatedByOwner($relationAlias = null) Adds a RIGHT JOIN clause to the query using the EmailAddressRelatedByOwner relation
+ * @method     ChildUserQuery innerJoinEmailAddressRelatedByOwner($relationAlias = null) Adds a INNER JOIN clause to the query using the EmailAddressRelatedByOwner relation
+ *
  * @method     ChildUserQuery leftJoinCertificate($relationAlias = null) Adds a LEFT JOIN clause to the query using the Certificate relation
  * @method     ChildUserQuery rightJoinCertificate($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Certificate relation
  * @method     ChildUserQuery innerJoinCertificate($relationAlias = null) Adds a INNER JOIN clause to the query using the Certificate relation
@@ -48,7 +58,7 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUserQuery rightJoinInvite($relationAlias = null) Adds a RIGHT JOIN clause to the query using the Invite relation
  * @method     ChildUserQuery innerJoinInvite($relationAlias = null) Adds a INNER JOIN clause to the query using the Invite relation
  *
- * @method     \Eater\Glim\Model\CertificateQuery|\Eater\Glim\Model\InviteQuery endUse() Finalizes a secondary criteria and merges it with its primary Criteria
+ * @method     \Eater\Glim\Model\EmailAddressQuery|\Eater\Glim\Model\CertificateQuery|\Eater\Glim\Model\InviteQuery endUse() Finalizes a secondary criteria and merges it with its primary Criteria
  *
  * @method     ChildUser findOne(ConnectionInterface $con = null) Return the first ChildUser matching the query
  * @method     ChildUser findOneOrCreate(ConnectionInterface $con = null) Return the first ChildUser matching the query, or a new ChildUser object populated from the query conditions when no match is found
@@ -56,6 +66,7 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUser findOneById(int $id) Return the first ChildUser filtered by the id column
  * @method     ChildUser findOneByMaxKeys(int $max_keys) Return the first ChildUser filtered by the max_keys column
  * @method     ChildUser findOneByUsername(string $username) Return the first ChildUser filtered by the username column
+ * @method     ChildUser findOneByEmail(int $email) Return the first ChildUser filtered by the email column
  * @method     ChildUser findOneByPassword(string $password) Return the first ChildUser filtered by the password column
  * @method     ChildUser findOneBySuperuser(boolean $superuser) Return the first ChildUser filtered by the superuser column
  * @method     ChildUser findOneByMaxInvites(int $max_invites) Return the first ChildUser filtered by the max_invites column
@@ -67,6 +78,7 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUser requireOneById(int $id) Return the first ChildUser filtered by the id column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
  * @method     ChildUser requireOneByMaxKeys(int $max_keys) Return the first ChildUser filtered by the max_keys column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
  * @method     ChildUser requireOneByUsername(string $username) Return the first ChildUser filtered by the username column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
+ * @method     ChildUser requireOneByEmail(int $email) Return the first ChildUser filtered by the email column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
  * @method     ChildUser requireOneByPassword(string $password) Return the first ChildUser filtered by the password column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
  * @method     ChildUser requireOneBySuperuser(boolean $superuser) Return the first ChildUser filtered by the superuser column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
  * @method     ChildUser requireOneByMaxInvites(int $max_invites) Return the first ChildUser filtered by the max_invites column and throws \Propel\Runtime\Exception\EntityNotFoundException when not found
@@ -76,6 +88,7 @@ use Propel\Runtime\Exception\PropelException;
  * @method     ChildUser[]|ObjectCollection findById(int $id) Return ChildUser objects filtered by the id column
  * @method     ChildUser[]|ObjectCollection findByMaxKeys(int $max_keys) Return ChildUser objects filtered by the max_keys column
  * @method     ChildUser[]|ObjectCollection findByUsername(string $username) Return ChildUser objects filtered by the username column
+ * @method     ChildUser[]|ObjectCollection findByEmail(int $email) Return ChildUser objects filtered by the email column
  * @method     ChildUser[]|ObjectCollection findByPassword(string $password) Return ChildUser objects filtered by the password column
  * @method     ChildUser[]|ObjectCollection findBySuperuser(boolean $superuser) Return ChildUser objects filtered by the superuser column
  * @method     ChildUser[]|ObjectCollection findByMaxInvites(int $max_invites) Return ChildUser objects filtered by the max_invites column
@@ -172,7 +185,7 @@ abstract class UserQuery extends ModelCriteria
      */
     protected function findPkSimple($key, ConnectionInterface $con)
     {
-        $sql = 'SELECT id, max_keys, username, password, superuser, max_invites, used_invites FROM User WHERE id = :p0';
+        $sql = 'SELECT id, max_keys, username, email, password, superuser, max_invites, used_invites FROM user WHERE id = :p0';
         try {
             $stmt = $con->prepare($sql);
             $stmt->bindValue(':p0', $key, PDO::PARAM_INT);
@@ -373,6 +386,49 @@ abstract class UserQuery extends ModelCriteria
         return $this->addUsingAlias(UserTableMap::COL_USERNAME, $username, $comparison);
     }
 
+    /**
+     * Filter the query on the email column
+     *
+     * Example usage:
+     * <code>
+     * $query->filterByEmail(1234); // WHERE email = 1234
+     * $query->filterByEmail(array(12, 34)); // WHERE email IN (12, 34)
+     * $query->filterByEmail(array('min' => 12)); // WHERE email > 12
+     * </code>
+     *
+     * @see       filterByEmailAddressRelatedByEmail()
+     *
+     * @param     mixed $email The value to use as filter.
+     *              Use scalar values for equality.
+     *              Use array values for in_array() equivalent.
+     *              Use associative array('min' => $minValue, 'max' => $maxValue) for intervals.
+     * @param     string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return $this|ChildUserQuery The current query, for fluid interface
+     */
+    public function filterByEmail($email = null, $comparison = null)
+    {
+        if (is_array($email)) {
+            $useMinMax = false;
+            if (isset($email['min'])) {
+                $this->addUsingAlias(UserTableMap::COL_EMAIL, $email['min'], Criteria::GREATER_EQUAL);
+                $useMinMax = true;
+            }
+            if (isset($email['max'])) {
+                $this->addUsingAlias(UserTableMap::COL_EMAIL, $email['max'], Criteria::LESS_EQUAL);
+                $useMinMax = true;
+            }
+            if ($useMinMax) {
+                return $this;
+            }
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+        }
+
+        return $this->addUsingAlias(UserTableMap::COL_EMAIL, $email, $comparison);
+    }
+
     /**
      * Filter the query on the password column
      *
@@ -511,6 +567,156 @@ abstract class UserQuery extends ModelCriteria
         return $this->addUsingAlias(UserTableMap::COL_USED_INVITES, $usedInvites, $comparison);
     }
 
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailAddress object
+     *
+     * @param \Eater\Glim\Model\EmailAddress|ObjectCollection $emailAddress The related object(s) to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @throws \Propel\Runtime\Exception\PropelException
+     *
+     * @return ChildUserQuery The current query, for fluid interface
+     */
+    public function filterByEmailAddressRelatedByEmail($emailAddress, $comparison = null)
+    {
+        if ($emailAddress instanceof \Eater\Glim\Model\EmailAddress) {
+            return $this
+                ->addUsingAlias(UserTableMap::COL_EMAIL, $emailAddress->getId(), $comparison);
+        } elseif ($emailAddress instanceof ObjectCollection) {
+            if (null === $comparison) {
+                $comparison = Criteria::IN;
+            }
+
+            return $this
+                ->addUsingAlias(UserTableMap::COL_EMAIL, $emailAddress->toKeyValue('PrimaryKey', 'Id'), $comparison);
+        } else {
+            throw new PropelException('filterByEmailAddressRelatedByEmail() only accepts arguments of type \Eater\Glim\Model\EmailAddress or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the EmailAddressRelatedByEmail relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildUserQuery The current query, for fluid interface
+     */
+    public function joinEmailAddressRelatedByEmail($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('EmailAddressRelatedByEmail');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'EmailAddressRelatedByEmail');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the EmailAddressRelatedByEmail relation EmailAddress object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailAddressQuery A secondary query class using the current class as primary query
+     */
+    public function useEmailAddressRelatedByEmailQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinEmailAddressRelatedByEmail($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'EmailAddressRelatedByEmail', '\Eater\Glim\Model\EmailAddressQuery');
+    }
+
+    /**
+     * Filter the query by a related \Eater\Glim\Model\EmailAddress object
+     *
+     * @param \Eater\Glim\Model\EmailAddress|ObjectCollection $emailAddress the related object to use as filter
+     * @param string $comparison Operator to use for the column comparison, defaults to Criteria::EQUAL
+     *
+     * @return ChildUserQuery The current query, for fluid interface
+     */
+    public function filterByEmailAddressRelatedByOwner($emailAddress, $comparison = null)
+    {
+        if ($emailAddress instanceof \Eater\Glim\Model\EmailAddress) {
+            return $this
+                ->addUsingAlias(UserTableMap::COL_ID, $emailAddress->getOwner(), $comparison);
+        } elseif ($emailAddress instanceof ObjectCollection) {
+            return $this
+                ->useEmailAddressRelatedByOwnerQuery()
+                ->filterByPrimaryKeys($emailAddress->getPrimaryKeys())
+                ->endUse();
+        } else {
+            throw new PropelException('filterByEmailAddressRelatedByOwner() only accepts arguments of type \Eater\Glim\Model\EmailAddress or Collection');
+        }
+    }
+
+    /**
+     * Adds a JOIN clause to the query using the EmailAddressRelatedByOwner relation
+     *
+     * @param     string $relationAlias optional alias for the relation
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return $this|ChildUserQuery The current query, for fluid interface
+     */
+    public function joinEmailAddressRelatedByOwner($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        $tableMap = $this->getTableMap();
+        $relationMap = $tableMap->getRelation('EmailAddressRelatedByOwner');
+
+        // create a ModelJoin object for this join
+        $join = new ModelJoin();
+        $join->setJoinType($joinType);
+        $join->setRelationMap($relationMap, $this->useAliasInSQL ? $this->getModelAlias() : null, $relationAlias);
+        if ($previousJoin = $this->getPreviousJoin()) {
+            $join->setPreviousJoin($previousJoin);
+        }
+
+        // add the ModelJoin to the current object
+        if ($relationAlias) {
+            $this->addAlias($relationAlias, $relationMap->getRightTable()->getName());
+            $this->addJoinObject($join, $relationAlias);
+        } else {
+            $this->addJoinObject($join, 'EmailAddressRelatedByOwner');
+        }
+
+        return $this;
+    }
+
+    /**
+     * Use the EmailAddressRelatedByOwner relation EmailAddress object
+     *
+     * @see useQuery()
+     *
+     * @param     string $relationAlias optional alias for the relation,
+     *                                   to be used as main alias in the secondary query
+     * @param     string $joinType Accepted values are null, 'left join', 'right join', 'inner join'
+     *
+     * @return \Eater\Glim\Model\EmailAddressQuery A secondary query class using the current class as primary query
+     */
+    public function useEmailAddressRelatedByOwnerQuery($relationAlias = null, $joinType = Criteria::LEFT_JOIN)
+    {
+        return $this
+            ->joinEmailAddressRelatedByOwner($relationAlias, $joinType)
+            ->useQuery($relationAlias ? $relationAlias : 'EmailAddressRelatedByOwner', '\Eater\Glim\Model\EmailAddressQuery');
+    }
+
     /**
      * Filter the query by a related \Eater\Glim\Model\Certificate object
      *
@@ -674,7 +880,7 @@ abstract class UserQuery extends ModelCriteria
     }
 
     /**
-     * Deletes all rows from the User table.
+     * Deletes all rows from the user table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/EmailAddress.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace Eater\Glim\Model;
+
+use Eater\Glim\Model\Base\EmailAddress as BaseEmailAddress;
+
+/**
+ * Skeleton subclass for representing a row from the 'email_address' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class EmailAddress extends BaseEmailAddress
+{
+    public function fillVerification()
+    {
+        $this->setVerification(bin2hex(openssl_random_pseudo_bytes(32)));
+    }
+}

src/Model/EmailAddressQuery.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Eater\Glim\Model;
+
+use Eater\Glim\Model\Base\EmailAddressQuery as BaseEmailAddressQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'email_address' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class EmailAddressQuery extends BaseEmailAddressQuery
+{
+
+}

src/Model/EmailMessage.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace Eater\Glim\Model;
+
+use Eater\Glim\Model\Base\EmailMessage as BaseEmailMessage;
+
+/**
+ * Skeleton subclass for representing a row from the 'email_message' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class EmailMessage extends BaseEmailMessage
+{
+    public function getRecipientEmail()
+    {
+        return $this->getRecipientEmailAddress()->getAddress();
+    }
+
+    public function getRecipientName()
+    {
+        return $this->getRecipientEmailAddress()->getUserRelatedByOwner()->getUsername();
+    }
+
+    public function getSenderName() {
+        $emailAddress = $this->getSenderEmailAddress();
+
+        if ($emailAddress === null) {
+            return 'Zer.ooo system';
+        }
+
+        return $emailAddress->getUserRelatedByOwner()->getUsername();
+    }
+
+    public function getSenderEmail() {
+        $emailAddress = $this->getSenderEmailAddress();
+
+        if ($emailAddress === null) {
+            return 'info@zer.ooo';
+        }
+
+        return $emailAddress->getAddress();
+    }
+}

src/Model/EmailMessageQuery.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Eater\Glim\Model;
+
+use Eater\Glim\Model\Base\EmailMessageQuery as BaseEmailMessageQuery;
+
+/**
+ * Skeleton subclass for performing query and update operations on the 'email_message' table.
+ *
+ *
+ *
+ * You should add additional methods to this class to meet the
+ * application requirements.  This class will only be generated as
+ * long as it does not already exist in the output directory.
+ *
+ */
+class EmailMessageQuery extends BaseEmailMessageQuery
+{
+
+}

src/Model/Map/CertificateTableMap.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Map\TableMapTrait;
 
 
 /**
- * This class defines the structure of the 'Certificate' table.
+ * This class defines the structure of the 'certificate' table.
  *
  *
  *
@@ -44,7 +44,7 @@ class CertificateTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'Certificate';
+    const TABLE_NAME = 'certificate';
 
     /**
      * The related Propel class for this table
@@ -74,42 +74,42 @@ class CertificateTableMap extends TableMap
     /**
      * the column name for the id field
      */
-    const COL_ID = 'Certificate.id';
+    const COL_ID = 'certificate.id';
 
     /**
      * the column name for the user_id field
      */
-    const COL_USER_ID = 'Certificate.user_id';
+    const COL_USER_ID = 'certificate.user_id';
 
     /**
      * the column name for the name field
      */
-    const COL_NAME = 'Certificate.name';
+    const COL_NAME = 'certificate.name';
 
     /**
      * the column name for the certificate field
      */
-    const COL_CERTIFICATE = 'Certificate.certificate';
+    const COL_CERTIFICATE = 'certificate.certificate';
 
     /**
      * the column name for the private_key field
      */
-    const COL_PRIVATE_KEY = 'Certificate.private_key';
+    const COL_PRIVATE_KEY = 'certificate.private_key';
 
     /**
      * the column name for the expires_on field
      */
-    const COL_EXPIRES_ON = 'Certificate.expires_on';
+    const COL_EXPIRES_ON = 'certificate.expires_on';
 
     /**
      * the column name for the revoked field
      */
-    const COL_REVOKED = 'Certificate.revoked';
+    const COL_REVOKED = 'certificate.revoked';
 
     /**
      * the column name for the serial field
      */
-    const COL_SERIAL = 'Certificate.serial';
+    const COL_SERIAL = 'certificate.serial';
 
     /**
      * The default string format for model objects of the related table
@@ -154,7 +154,7 @@ class CertificateTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('Certificate');
+        $this->setName('certificate');
         $this->setPhpName('Certificate');
         $this->setIdentifierQuoting(false);
         $this->setClassName('\\Eater\\Glim\\Model\\Certificate');
@@ -162,7 +162,7 @@ class CertificateTableMap extends TableMap
         $this->setUseIdGenerator(true);
         // columns
         $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
-        $this->addForeignKey('user_id', 'UserId', 'INTEGER', 'User', 'id', false, null, null);
+        $this->addForeignKey('user_id', 'UserId', 'INTEGER', 'user', 'id', false, null, null);
         $this->addColumn('name', 'Name', 'VARCHAR', false, 64, null);
         $this->addColumn('certificate', 'Certificate', 'LONGVARCHAR', false, null, null);
         $this->addColumn('private_key', 'PrivateKey', 'LONGVARCHAR', false, null, null);
@@ -411,7 +411,7 @@ class CertificateTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the Certificate table.
+     * Deletes all rows from the certificate table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Map/EmailAddressTableMap.php

@@ -0,0 +1,460 @@
+<?php
+
+namespace Eater\Glim\Model\Map;
+
+use Eater\Glim\Model\EmailAddress;
+use Eater\Glim\Model\EmailAddressQuery;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\DataFetcher\DataFetcherInterface;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+
+
+/**
+ * This class defines the structure of the 'email_address' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class EmailAddressTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = '.Map.EmailAddressTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'default';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'email_address';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Eater\\Glim\\Model\\EmailAddress';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'EmailAddress';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 5;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 5;
+
+    /**
+     * the column name for the id field
+     */
+    const COL_ID = 'email_address.id';
+
+    /**
+     * the column name for the verified field
+     */
+    const COL_VERIFIED = 'email_address.verified';
+
+    /**
+     * the column name for the verification field
+     */
+    const COL_VERIFICATION = 'email_address.verification';
+
+    /**
+     * the column name for the address field
+     */
+    const COL_ADDRESS = 'email_address.address';
+
+    /**
+     * the column name for the owner field
+     */
+    const COL_OWNER = 'email_address.owner';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Id', 'Verified', 'Verification', 'Address', 'Owner', ),
+        self::TYPE_CAMELNAME     => array('id', 'verified', 'verification', 'address', 'owner', ),
+        self::TYPE_COLNAME       => array(EmailAddressTableMap::COL_ID, EmailAddressTableMap::COL_VERIFIED, EmailAddressTableMap::COL_VERIFICATION, EmailAddressTableMap::COL_ADDRESS, EmailAddressTableMap::COL_OWNER, ),
+        self::TYPE_FIELDNAME     => array('id', 'verified', 'verification', 'address', 'owner', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Id' => 0, 'Verified' => 1, 'Verification' => 2, 'Address' => 3, 'Owner' => 4, ),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'verified' => 1, 'verification' => 2, 'address' => 3, 'owner' => 4, ),
+        self::TYPE_COLNAME       => array(EmailAddressTableMap::COL_ID => 0, EmailAddressTableMap::COL_VERIFIED => 1, EmailAddressTableMap::COL_VERIFICATION => 2, EmailAddressTableMap::COL_ADDRESS => 3, EmailAddressTableMap::COL_OWNER => 4, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'verified' => 1, 'verification' => 2, 'address' => 3, 'owner' => 4, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('email_address');
+        $this->setPhpName('EmailAddress');
+        $this->setIdentifierQuoting(false);
+        $this->setClassName('\\Eater\\Glim\\Model\\EmailAddress');
+        $this->setPackage('');
+        $this->setUseIdGenerator(true);
+        // columns
+        $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
+        $this->addColumn('verified', 'Verified', 'BOOLEAN', false, null, false);
+        $this->addColumn('verification', 'Verification', 'VARCHAR', false, 64, null);
+        $this->addColumn('address', 'Address', 'VARCHAR', false, 256, null);
+        $this->addForeignKey('owner', 'Owner', 'INTEGER', 'user', 'id', false, null, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('UserRelatedByOwner', '\\Eater\\Glim\\Model\\User', RelationMap::MANY_TO_ONE, array (
+  0 =>
+  array (
+    0 => ':owner',
+    1 => ':id',
+  ),
+), null, null, null, false);
+        $this->addRelation('UserRelatedByEmail', '\\Eater\\Glim\\Model\\User', RelationMap::ONE_TO_MANY, array (
+  0 =>
+  array (
+    0 => ':email',
+    1 => ':id',
+  ),
+), null, null, 'UsersRelatedByEmail', false);
+        $this->addRelation('EmailMessageRelatedByRecipient', '\\Eater\\Glim\\Model\\EmailMessage', RelationMap::ONE_TO_MANY, array (
+  0 =>
+  array (
+    0 => ':recipient',
+    1 => ':id',
+  ),
+), null, null, 'EmailMessagesRelatedByRecipient', false);
+        $this->addRelation('EmailMessageRelatedBySender', '\\Eater\\Glim\\Model\\EmailMessage', RelationMap::ONE_TO_MANY, array (
+  0 =>
+  array (
+    0 => ':sender',
+    1 => ':id',
+  ),
+), null, null, 'EmailMessagesRelatedBySender', false);
+    } // buildRelations()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return string The primary key hash of the row
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        // If the PK cannot be derived from the row, return NULL.
+        if ($row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)] === null) {
+            return null;
+        }
+
+        return (string) $row[TableMap::TYPE_NUM == $indexType ? 0 + $offset : static::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)];
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        return (int) $row[
+            $indexType == TableMap::TYPE_NUM
+                ? 0 + $offset
+                : self::translateFieldName('Id', TableMap::TYPE_PHPNAME, $indexType)
+        ];
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? EmailAddressTableMap::CLASS_DEFAULT : EmailAddressTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     * @return array           (EmailAddress object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = EmailAddressTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = EmailAddressTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + EmailAddressTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = EmailAddressTableMap::OM_CLASS;
+            /** @var EmailAddress $obj */
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            EmailAddressTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = EmailAddressTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = EmailAddressTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                /** @var EmailAddress $obj */
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                EmailAddressTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(EmailAddressTableMap::COL_ID);
+            $criteria->addSelectColumn(EmailAddressTableMap::COL_VERIFIED);
+            $criteria->addSelectColumn(EmailAddressTableMap::COL_VERIFICATION);
+            $criteria->addSelectColumn(EmailAddressTableMap::COL_ADDRESS);
+            $criteria->addSelectColumn(EmailAddressTableMap::COL_OWNER);
+        } else {
+            $criteria->addSelectColumn($alias . '.id');
+            $criteria->addSelectColumn($alias . '.verified');
+            $criteria->addSelectColumn($alias . '.verification');
+            $criteria->addSelectColumn($alias . '.address');
+            $criteria->addSelectColumn($alias . '.owner');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(EmailAddressTableMap::DATABASE_NAME)->getTable(EmailAddressTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+        $dbMap = Propel::getServiceContainer()->getDatabaseMap(EmailAddressTableMap::DATABASE_NAME);
+        if (!$dbMap->hasTable(EmailAddressTableMap::TABLE_NAME)) {
+            $dbMap->addTableObject(new EmailAddressTableMap());
+        }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a EmailAddress or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or EmailAddress object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param  ConnectionInterface $con the connection to use
+     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                         if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailAddressTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Eater\Glim\Model\EmailAddress) { // it's a model object
+            // create criteria based on pk values
+            $criteria = $values->buildPkeyCriteria();
+        } else { // it's a primary key, or an array of pks
+            $criteria = new Criteria(EmailAddressTableMap::DATABASE_NAME);
+            $criteria->add(EmailAddressTableMap::COL_ID, (array) $values, Criteria::IN);
+        }
+
+        $query = EmailAddressQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) {
+            EmailAddressTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) {
+                EmailAddressTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the email_address table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return EmailAddressQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a EmailAddress or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or EmailAddress object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailAddressTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from EmailAddress object
+        }
+
+        if ($criteria->containsKey(EmailAddressTableMap::COL_ID) && $criteria->keyContainsValue(EmailAddressTableMap::COL_ID) ) {
+            throw new PropelException('Cannot insert a value for auto-increment primary key ('.EmailAddressTableMap::COL_ID.')');
+        }
+
+
+        // Set the correct dbName
+        $query = EmailAddressQuery::create()->mergeWith($criteria);
+
+        // use transaction because $criteria could contain info
+        // for more than one table (I guess, conceivably)
+        return $con->transaction(function () use ($con, $query) {
+            return $query->doInsert($con);
+        });
+    }
+
+} // EmailAddressTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+EmailAddressTableMap::buildTableMap();

src/Model/Map/EmailMessageTableMap.php

@@ -0,0 +1,425 @@
+<?php
+
+namespace Eater\Glim\Model\Map;
+
+use Eater\Glim\Model\EmailMessage;
+use Eater\Glim\Model\EmailMessageQuery;
+use Propel\Runtime\Propel;
+use Propel\Runtime\ActiveQuery\Criteria;
+use Propel\Runtime\ActiveQuery\InstancePoolTrait;
+use Propel\Runtime\Connection\ConnectionInterface;
+use Propel\Runtime\DataFetcher\DataFetcherInterface;
+use Propel\Runtime\Exception\LogicException;
+use Propel\Runtime\Exception\PropelException;
+use Propel\Runtime\Map\RelationMap;
+use Propel\Runtime\Map\TableMap;
+use Propel\Runtime\Map\TableMapTrait;
+
+
+/**
+ * This class defines the structure of the 'email_message' table.
+ *
+ *
+ *
+ * This map class is used by Propel to do runtime db structure discovery.
+ * For example, the createSelectSql() method checks the type of a given column used in an
+ * ORDER BY clause to know whether it needs to apply SQL to make the ORDER BY case-insensitive
+ * (i.e. if it's a text column type).
+ *
+ */
+class EmailMessageTableMap extends TableMap
+{
+    use InstancePoolTrait;
+    use TableMapTrait;
+
+    /**
+     * The (dot-path) name of this class
+     */
+    const CLASS_NAME = '.Map.EmailMessageTableMap';
+
+    /**
+     * The default database name for this class
+     */
+    const DATABASE_NAME = 'default';
+
+    /**
+     * The table name for this class
+     */
+    const TABLE_NAME = 'email_message';
+
+    /**
+     * The related Propel class for this table
+     */
+    const OM_CLASS = '\\Eater\\Glim\\Model\\EmailMessage';
+
+    /**
+     * A class that can be returned by this tableMap
+     */
+    const CLASS_DEFAULT = 'EmailMessage';
+
+    /**
+     * The total number of columns
+     */
+    const NUM_COLUMNS = 4;
+
+    /**
+     * The number of lazy-loaded columns
+     */
+    const NUM_LAZY_LOAD_COLUMNS = 0;
+
+    /**
+     * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
+     */
+    const NUM_HYDRATE_COLUMNS = 4;
+
+    /**
+     * the column name for the recipient field
+     */
+    const COL_RECIPIENT = 'email_message.recipient';
+
+    /**
+     * the column name for the sender field
+     */
+    const COL_SENDER = 'email_message.sender';
+
+    /**
+     * the column name for the contents field
+     */
+    const COL_CONTENTS = 'email_message.contents';
+
+    /**
+     * the column name for the subject field
+     */
+    const COL_SUBJECT = 'email_message.subject';
+
+    /**
+     * The default string format for model objects of the related table
+     */
+    const DEFAULT_STRING_FORMAT = 'YAML';
+
+    /**
+     * holds an array of fieldnames
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
+     */
+    protected static $fieldNames = array (
+        self::TYPE_PHPNAME       => array('Recipient', 'Sender', 'Contents', 'Subject', ),
+        self::TYPE_CAMELNAME     => array('recipient', 'sender', 'contents', 'subject', ),
+        self::TYPE_COLNAME       => array(EmailMessageTableMap::COL_RECIPIENT, EmailMessageTableMap::COL_SENDER, EmailMessageTableMap::COL_CONTENTS, EmailMessageTableMap::COL_SUBJECT, ),
+        self::TYPE_FIELDNAME     => array('recipient', 'sender', 'contents', 'subject', ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, )
+    );
+
+    /**
+     * holds an array of keys for quick access to the fieldnames array
+     *
+     * first dimension keys are the type constants
+     * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
+     */
+    protected static $fieldKeys = array (
+        self::TYPE_PHPNAME       => array('Recipient' => 0, 'Sender' => 1, 'Contents' => 2, 'Subject' => 3, ),
+        self::TYPE_CAMELNAME     => array('recipient' => 0, 'sender' => 1, 'contents' => 2, 'subject' => 3, ),
+        self::TYPE_COLNAME       => array(EmailMessageTableMap::COL_RECIPIENT => 0, EmailMessageTableMap::COL_SENDER => 1, EmailMessageTableMap::COL_CONTENTS => 2, EmailMessageTableMap::COL_SUBJECT => 3, ),
+        self::TYPE_FIELDNAME     => array('recipient' => 0, 'sender' => 1, 'contents' => 2, 'subject' => 3, ),
+        self::TYPE_NUM           => array(0, 1, 2, 3, )
+    );
+
+    /**
+     * Initialize the table attributes and columns
+     * Relations are not initialized by this method since they are lazy loaded
+     *
+     * @return void
+     * @throws PropelException
+     */
+    public function initialize()
+    {
+        // attributes
+        $this->setName('email_message');
+        $this->setPhpName('EmailMessage');
+        $this->setIdentifierQuoting(false);
+        $this->setClassName('\\Eater\\Glim\\Model\\EmailMessage');
+        $this->setPackage('');
+        $this->setUseIdGenerator(false);
+        // columns
+        $this->addForeignKey('recipient', 'Recipient', 'INTEGER', 'email_address', 'id', false, null, null);
+        $this->addForeignKey('sender', 'Sender', 'INTEGER', 'email_address', 'id', false, null, null);
+        $this->addColumn('contents', 'Contents', 'LONGVARCHAR', false, null, null);
+        $this->addColumn('subject', 'Subject', 'VARCHAR', false, 256, null);
+    } // initialize()
+
+    /**
+     * Build the RelationMap objects for this table relationships
+     */
+    public function buildRelations()
+    {
+        $this->addRelation('RecipientEmailAddress', '\\Eater\\Glim\\Model\\EmailAddress', RelationMap::MANY_TO_ONE, array (
+  0 =>
+  array (
+    0 => ':recipient',
+    1 => ':id',
+  ),
+), null, null, null, false);
+        $this->addRelation('SenderEmailAddress', '\\Eater\\Glim\\Model\\EmailAddress', RelationMap::MANY_TO_ONE, array (
+  0 =>
+  array (
+    0 => ':sender',
+    1 => ':id',
+  ),
+), null, null, null, false);
+    } // buildRelations()
+
+    /**
+     * Retrieves a string version of the primary key from the DB resultset row that can be used to uniquely identify a row in this table.
+     *
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, a serialize()d version of the primary key will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return string The primary key hash of the row
+     */
+    public static function getPrimaryKeyHashFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        return null;
+    }
+
+    /**
+     * Retrieves the primary key from the DB resultset row
+     * For tables with a single-column primary key, that simple pkey value will be returned.  For tables with
+     * a multi-column primary key, an array of the primary key columns will be returned.
+     *
+     * @param array  $row       resultset row.
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM
+     *
+     * @return mixed The primary key of the row
+     */
+    public static function getPrimaryKeyFromRow($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        return '';
+    }
+
+    /**
+     * The class that the tableMap will make instances of.
+     *
+     * If $withPrefix is true, the returned path
+     * uses a dot-path notation which is translated into a path
+     * relative to a location on the PHP include_path.
+     * (e.g. path.to.MyClass -> 'path/to/MyClass.php')
+     *
+     * @param boolean $withPrefix Whether or not to return the path with the class name
+     * @return string path.to.ClassName
+     */
+    public static function getOMClass($withPrefix = true)
+    {
+        return $withPrefix ? EmailMessageTableMap::CLASS_DEFAULT : EmailMessageTableMap::OM_CLASS;
+    }
+
+    /**
+     * Populates an object of the default type or an object that inherit from the default.
+     *
+     * @param array  $row       row returned by DataFetcher->fetch().
+     * @param int    $offset    The 0-based offset for reading from the resultset row.
+     * @param string $indexType The index type of $row. Mostly DataFetcher->getIndexType().
+                                 One of the class type constants TableMap::TYPE_PHPNAME, TableMap::TYPE_CAMELNAME
+     *                           TableMap::TYPE_COLNAME, TableMap::TYPE_FIELDNAME, TableMap::TYPE_NUM.
+     *
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     * @return array           (EmailMessage object, last column rank)
+     */
+    public static function populateObject($row, $offset = 0, $indexType = TableMap::TYPE_NUM)
+    {
+        $key = EmailMessageTableMap::getPrimaryKeyHashFromRow($row, $offset, $indexType);
+        if (null !== ($obj = EmailMessageTableMap::getInstanceFromPool($key))) {
+            // We no longer rehydrate the object, since this can cause data loss.
+            // See http://www.propelorm.org/ticket/509
+            // $obj->hydrate($row, $offset, true); // rehydrate
+            $col = $offset + EmailMessageTableMap::NUM_HYDRATE_COLUMNS;
+        } else {
+            $cls = EmailMessageTableMap::OM_CLASS;
+            /** @var EmailMessage $obj */
+            $obj = new $cls();
+            $col = $obj->hydrate($row, $offset, false, $indexType);
+            EmailMessageTableMap::addInstanceToPool($obj, $key);
+        }
+
+        return array($obj, $col);
+    }
+
+    /**
+     * The returned array will contain objects of the default type or
+     * objects that inherit from the default.
+     *
+     * @param DataFetcherInterface $dataFetcher
+     * @return array
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function populateObjects(DataFetcherInterface $dataFetcher)
+    {
+        $results = array();
+
+        // set the class once to avoid overhead in the loop
+        $cls = static::getOMClass(false);
+        // populate the object(s)
+        while ($row = $dataFetcher->fetch()) {
+            $key = EmailMessageTableMap::getPrimaryKeyHashFromRow($row, 0, $dataFetcher->getIndexType());
+            if (null !== ($obj = EmailMessageTableMap::getInstanceFromPool($key))) {
+                // We no longer rehydrate the object, since this can cause data loss.
+                // See http://www.propelorm.org/ticket/509
+                // $obj->hydrate($row, 0, true); // rehydrate
+                $results[] = $obj;
+            } else {
+                /** @var EmailMessage $obj */
+                $obj = new $cls();
+                $obj->hydrate($row);
+                $results[] = $obj;
+                EmailMessageTableMap::addInstanceToPool($obj, $key);
+            } // if key exists
+        }
+
+        return $results;
+    }
+    /**
+     * Add all the columns needed to create a new object.
+     *
+     * Note: any columns that were marked with lazyLoad="true" in the
+     * XML schema will not be added to the select list and only loaded
+     * on demand.
+     *
+     * @param Criteria $criteria object containing the columns to add.
+     * @param string   $alias    optional table alias
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function addSelectColumns(Criteria $criteria, $alias = null)
+    {
+        if (null === $alias) {
+            $criteria->addSelectColumn(EmailMessageTableMap::COL_RECIPIENT);
+            $criteria->addSelectColumn(EmailMessageTableMap::COL_SENDER);
+            $criteria->addSelectColumn(EmailMessageTableMap::COL_CONTENTS);
+            $criteria->addSelectColumn(EmailMessageTableMap::COL_SUBJECT);
+        } else {
+            $criteria->addSelectColumn($alias . '.recipient');
+            $criteria->addSelectColumn($alias . '.sender');
+            $criteria->addSelectColumn($alias . '.contents');
+            $criteria->addSelectColumn($alias . '.subject');
+        }
+    }
+
+    /**
+     * Returns the TableMap related to this object.
+     * This method is not needed for general use but a specific application could have a need.
+     * @return TableMap
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function getTableMap()
+    {
+        return Propel::getServiceContainer()->getDatabaseMap(EmailMessageTableMap::DATABASE_NAME)->getTable(EmailMessageTableMap::TABLE_NAME);
+    }
+
+    /**
+     * Add a TableMap instance to the database for this tableMap class.
+     */
+    public static function buildTableMap()
+    {
+        $dbMap = Propel::getServiceContainer()->getDatabaseMap(EmailMessageTableMap::DATABASE_NAME);
+        if (!$dbMap->hasTable(EmailMessageTableMap::TABLE_NAME)) {
+            $dbMap->addTableObject(new EmailMessageTableMap());
+        }
+    }
+
+    /**
+     * Performs a DELETE on the database, given a EmailMessage or Criteria object OR a primary key value.
+     *
+     * @param mixed               $values Criteria or EmailMessage object or primary key or array of primary keys
+     *              which is used to create the DELETE statement
+     * @param  ConnectionInterface $con the connection to use
+     * @return int             The number of affected rows (if supported by underlying database driver).  This includes CASCADE-related rows
+     *                         if supported by native driver or if emulated using Propel.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+     public static function doDelete($values, ConnectionInterface $con = null)
+     {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailMessageTableMap::DATABASE_NAME);
+        }
+
+        if ($values instanceof Criteria) {
+            // rename for clarity
+            $criteria = $values;
+        } elseif ($values instanceof \Eater\Glim\Model\EmailMessage) { // it's a model object
+            // create criteria based on pk value
+            $criteria = $values->buildCriteria();
+        } else { // it's a primary key, or an array of pks
+            throw new LogicException('The EmailMessage object has no primary key');
+        }
+
+        $query = EmailMessageQuery::create()->mergeWith($criteria);
+
+        if ($values instanceof Criteria) {
+            EmailMessageTableMap::clearInstancePool();
+        } elseif (!is_object($values)) { // it's a primary key, or an array of pks
+            foreach ((array) $values as $singleval) {
+                EmailMessageTableMap::removeInstanceFromPool($singleval);
+            }
+        }
+
+        return $query->delete($con);
+    }
+
+    /**
+     * Deletes all rows from the email_message table.
+     *
+     * @param ConnectionInterface $con the connection to use
+     * @return int The number of affected rows (if supported by underlying database driver).
+     */
+    public static function doDeleteAll(ConnectionInterface $con = null)
+    {
+        return EmailMessageQuery::create()->doDeleteAll($con);
+    }
+
+    /**
+     * Performs an INSERT on the database, given a EmailMessage or Criteria object.
+     *
+     * @param mixed               $criteria Criteria or EmailMessage object containing data that is used to create the INSERT statement.
+     * @param ConnectionInterface $con the ConnectionInterface connection to use
+     * @return mixed           The new primary key.
+     * @throws PropelException Any exceptions caught during processing will be
+     *                         rethrown wrapped into a PropelException.
+     */
+    public static function doInsert($criteria, ConnectionInterface $con = null)
+    {
+        if (null === $con) {
+            $con = Propel::getServiceContainer()->getWriteConnection(EmailMessageTableMap::DATABASE_NAME);
+        }
+
+        if ($criteria instanceof Criteria) {
+            $criteria = clone $criteria; // rename for clarity
+        } else {
+            $criteria = $criteria->buildCriteria(); // build Criteria from EmailMessage object
+        }
+
+
+        // Set the correct dbName
+        $query = EmailMessageQuery::create()->mergeWith($criteria);
+
+        // use transaction because $criteria could contain info
+        // for more than one table (I guess, conceivably)
+        return $con->transaction(function () use ($con, $query) {
+            return $query->doInsert($con);
+        });
+    }
+
+} // EmailMessageTableMap
+// This is the static code needed to register the TableMap for this table with the main Propel class.
+//
+EmailMessageTableMap::buildTableMap();

src/Model/Map/InviteTableMap.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Map\TableMapTrait;
 
 
 /**
- * This class defines the structure of the 'Invite' table.
+ * This class defines the structure of the 'invite' table.
  *
  *
  *
@@ -44,7 +44,7 @@ class InviteTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'Invite';
+    const TABLE_NAME = 'invite';
 
     /**
      * The related Propel class for this table
@@ -74,17 +74,17 @@ class InviteTableMap extends TableMap
     /**
      * the column name for the id field
      */
-    const COL_ID = 'Invite.id';
+    const COL_ID = 'invite.id';
 
     /**
      * the column name for the invite field
      */
-    const COL_INVITE = 'Invite.invite';
+    const COL_INVITE = 'invite.invite';
 
     /**
      * the column name for the owner field
      */
-    const COL_OWNER = 'Invite.owner';
+    const COL_OWNER = 'invite.owner';
 
     /**
      * The default string format for model objects of the related table
@@ -129,7 +129,7 @@ class InviteTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('Invite');
+        $this->setName('invite');
         $this->setPhpName('Invite');
         $this->setIdentifierQuoting(false);
         $this->setClassName('\\Eater\\Glim\\Model\\Invite');
@@ -138,7 +138,7 @@ class InviteTableMap extends TableMap
         // columns
         $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
         $this->addColumn('invite', 'Invite', 'VARCHAR', false, 64, null);
-        $this->addForeignKey('owner', 'Owner', 'INTEGER', 'User', 'id', false, null, null);
+        $this->addForeignKey('owner', 'Owner', 'INTEGER', 'user', 'id', false, null, null);
     } // initialize()
 
     /**
@@ -371,7 +371,7 @@ class InviteTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the Invite table.
+     * Deletes all rows from the invite table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Map/ServerTableMap.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Map\TableMapTrait;
 
 
 /**
- * This class defines the structure of the 'Server' table.
+ * This class defines the structure of the 'server' table.
  *
  *
  *
@@ -44,7 +44,7 @@ class ServerTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'Server';
+    const TABLE_NAME = 'server';
 
     /**
      * The related Propel class for this table
@@ -74,77 +74,77 @@ class ServerTableMap extends TableMap
     /**
      * the column name for the id field
      */
-    const COL_ID = 'Server.id';
+    const COL_ID = 'server.id';
 
     /**
      * the column name for the fqdn field
      */
-    const COL_FQDN = 'Server.fqdn';
+    const COL_FQDN = 'server.fqdn';
 
     /**
      * the column name for the fingerprint field
      */
-    const COL_FINGERPRINT = 'Server.fingerprint';
+    const COL_FINGERPRINT = 'server.fingerprint';
 
     /**
      * the column name for the public_key field
      */
-    const COL_PUBLIC_KEY = 'Server.public_key';
+    const COL_PUBLIC_KEY = 'server.public_key';
 
     /**
      * the column name for the certificate field
      */
-    const COL_CERTIFICATE = 'Server.certificate';
+    const COL_CERTIFICATE = 'server.certificate';
 
     /**
      * the column name for the location field
      */
-    const COL_LOCATION = 'Server.location';
+    const COL_LOCATION = 'server.location';
 
     /**
      * the column name for the speed field
      */
-    const COL_SPEED = 'Server.speed';
+    const COL_SPEED = 'server.speed';
 
     /**
      * the column name for the external_ip field
      */
-    const COL_EXTERNAL_IP = 'Server.external_ip';
+    const COL_EXTERNAL_IP = 'server.external_ip';
 
     /**
      * the column name for the internal_ip field
      */
-    const COL_INTERNAL_IP = 'Server.internal_ip';
+    const COL_INTERNAL_IP = 'server.internal_ip';
 
     /**
      * the column name for the netmask field
      */
-    const COL_NETMASK = 'Server.netmask';
+    const COL_NETMASK = 'server.netmask';
 
     /**
      * the column name for the first_dns field
      */
-    const COL_FIRST_DNS = 'Server.first_dns';
+    const COL_FIRST_DNS = 'server.first_dns';
 
     /**
      * the column name for the second_dns field
      */
-    const COL_SECOND_DNS = 'Server.second_dns';
+    const COL_SECOND_DNS = 'server.second_dns';
 
     /**
      * the column name for the port field
      */
-    const COL_PORT = 'Server.port';
+    const COL_PORT = 'server.port';
 
     /**
      * the column name for the protocol field
      */
-    const COL_PROTOCOL = 'Server.protocol';
+    const COL_PROTOCOL = 'server.protocol';
 
     /**
      * the column name for the status field
      */
-    const COL_STATUS = 'Server.status';
+    const COL_STATUS = 'server.status';
 
     /**
      * The default string format for model objects of the related table
@@ -232,7 +232,7 @@ class ServerTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('Server');
+        $this->setName('server');
         $this->setPhpName('Server');
         $this->setIdentifierQuoting(false);
         $this->setClassName('\\Eater\\Glim\\Model\\Server');
@@ -512,7 +512,7 @@ class ServerTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the Server table.
+     * Deletes all rows from the server table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Model/Map/UserTableMap.php

@@ -16,7 +16,7 @@ use Propel\Runtime\Map\TableMapTrait;
 
 
 /**
- * This class defines the structure of the 'User' table.
+ * This class defines the structure of the 'user' table.
  *
  *
  *
@@ -44,7 +44,7 @@ class UserTableMap extends TableMap
     /**
      * The table name for this class
      */
-    const TABLE_NAME = 'User';
+    const TABLE_NAME = 'user';
 
     /**
      * The related Propel class for this table
@@ -59,7 +59,7 @@ class UserTableMap extends TableMap
     /**
      * The total number of columns
      */
-    const NUM_COLUMNS = 7;
+    const NUM_COLUMNS = 8;
 
     /**
      * The number of lazy-loaded columns
@@ -69,42 +69,47 @@ class UserTableMap extends TableMap
     /**
      * The number of columns to hydrate (NUM_COLUMNS - NUM_LAZY_LOAD_COLUMNS)
      */
-    const NUM_HYDRATE_COLUMNS = 7;
+    const NUM_HYDRATE_COLUMNS = 8;
 
     /**
      * the column name for the id field
      */
-    const COL_ID = 'User.id';
+    const COL_ID = 'user.id';
 
     /**
      * the column name for the max_keys field
      */
-    const COL_MAX_KEYS = 'User.max_keys';
+    const COL_MAX_KEYS = 'user.max_keys';
 
     /**
      * the column name for the username field
      */
-    const COL_USERNAME = 'User.username';
+    const COL_USERNAME = 'user.username';
+
+    /**
+     * the column name for the email field
+     */
+    const COL_EMAIL = 'user.email';
 
     /**
      * the column name for the password field
      */
-    const COL_PASSWORD = 'User.password';
+    const COL_PASSWORD = 'user.password';
 
     /**
      * the column name for the superuser field
      */
-    const COL_SUPERUSER = 'User.superuser';
+    const COL_SUPERUSER = 'user.superuser';
 
     /**
      * the column name for the max_invites field
      */
-    const COL_MAX_INVITES = 'User.max_invites';
+    const COL_MAX_INVITES = 'user.max_invites';
 
     /**
      * the column name for the used_invites field
      */
-    const COL_USED_INVITES = 'User.used_invites';
+    const COL_USED_INVITES = 'user.used_invites';
 
     /**
      * The default string format for model objects of the related table
@@ -118,11 +123,11 @@ class UserTableMap extends TableMap
      * e.g. self::$fieldNames[self::TYPE_PHPNAME][0] = 'Id'
      */
     protected static $fieldNames = array (
-        self::TYPE_PHPNAME       => array('Id', 'MaxKeys', 'Username', 'Password', 'Superuser', 'MaxInvites', 'UsedInvites', ),
+        self::TYPE_PHPNAME       => array('Id', 'MaxKeys', 'Username', 'Email', 'Password', 'Superuser', 'MaxInvites', 'UsedInvites', ),
-        self::TYPE_CAMELNAME     => array('id', 'maxKeys', 'username', 'password', 'superuser', 'maxInvites', 'usedInvites', ),
+        self::TYPE_CAMELNAME     => array('id', 'maxKeys', 'username', 'email', 'password', 'superuser', 'maxInvites', 'usedInvites', ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_MAX_KEYS, UserTableMap::COL_USERNAME, UserTableMap::COL_PASSWORD, UserTableMap::COL_SUPERUSER, UserTableMap::COL_MAX_INVITES, UserTableMap::COL_USED_INVITES, ),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID, UserTableMap::COL_MAX_KEYS, UserTableMap::COL_USERNAME, UserTableMap::COL_EMAIL, UserTableMap::COL_PASSWORD, UserTableMap::COL_SUPERUSER, UserTableMap::COL_MAX_INVITES, UserTableMap::COL_USED_INVITES, ),
-        self::TYPE_FIELDNAME     => array('id', 'max_keys', 'username', 'password', 'superuser', 'max_invites', 'used_invites', ),
+        self::TYPE_FIELDNAME     => array('id', 'max_keys', 'username', 'email', 'password', 'superuser', 'max_invites', 'used_invites', ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -132,11 +137,11 @@ class UserTableMap extends TableMap
      * e.g. self::$fieldKeys[self::TYPE_PHPNAME]['Id'] = 0
      */
     protected static $fieldKeys = array (
-        self::TYPE_PHPNAME       => array('Id' => 0, 'MaxKeys' => 1, 'Username' => 2, 'Password' => 3, 'Superuser' => 4, 'MaxInvites' => 5, 'UsedInvites' => 6, ),
+        self::TYPE_PHPNAME       => array('Id' => 0, 'MaxKeys' => 1, 'Username' => 2, 'Email' => 3, 'Password' => 4, 'Superuser' => 5, 'MaxInvites' => 6, 'UsedInvites' => 7, ),
-        self::TYPE_CAMELNAME     => array('id' => 0, 'maxKeys' => 1, 'username' => 2, 'password' => 3, 'superuser' => 4, 'maxInvites' => 5, 'usedInvites' => 6, ),
+        self::TYPE_CAMELNAME     => array('id' => 0, 'maxKeys' => 1, 'username' => 2, 'email' => 3, 'password' => 4, 'superuser' => 5, 'maxInvites' => 6, 'usedInvites' => 7, ),
-        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_MAX_KEYS => 1, UserTableMap::COL_USERNAME => 2, UserTableMap::COL_PASSWORD => 3, UserTableMap::COL_SUPERUSER => 4, UserTableMap::COL_MAX_INVITES => 5, UserTableMap::COL_USED_INVITES => 6, ),
+        self::TYPE_COLNAME       => array(UserTableMap::COL_ID => 0, UserTableMap::COL_MAX_KEYS => 1, UserTableMap::COL_USERNAME => 2, UserTableMap::COL_EMAIL => 3, UserTableMap::COL_PASSWORD => 4, UserTableMap::COL_SUPERUSER => 5, UserTableMap::COL_MAX_INVITES => 6, UserTableMap::COL_USED_INVITES => 7, ),
-        self::TYPE_FIELDNAME     => array('id' => 0, 'max_keys' => 1, 'username' => 2, 'password' => 3, 'superuser' => 4, 'max_invites' => 5, 'used_invites' => 6, ),
+        self::TYPE_FIELDNAME     => array('id' => 0, 'max_keys' => 1, 'username' => 2, 'email' => 3, 'password' => 4, 'superuser' => 5, 'max_invites' => 6, 'used_invites' => 7, ),
-        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, )
+        self::TYPE_NUM           => array(0, 1, 2, 3, 4, 5, 6, 7, )
     );
 
     /**
@@ -149,7 +154,7 @@ class UserTableMap extends TableMap
     public function initialize()
     {
         // attributes
-        $this->setName('User');
+        $this->setName('user');
         $this->setPhpName('User');
         $this->setIdentifierQuoting(false);
         $this->setClassName('\\Eater\\Glim\\Model\\User');
@@ -159,6 +164,7 @@ class UserTableMap extends TableMap
         $this->addPrimaryKey('id', 'Id', 'INTEGER', true, null, null);
         $this->addColumn('max_keys', 'MaxKeys', 'INTEGER', false, null, 5);
         $this->addColumn('username', 'Username', 'VARCHAR', false, 64, null);
+        $this->addForeignKey('email', 'Email', 'INTEGER', 'email_address', 'id', false, null, null);
         $this->addColumn('password', 'Password', 'VARCHAR', false, 64, null);
         $this->addColumn('superuser', 'Superuser', 'BOOLEAN', false, null, false);
         $this->addColumn('max_invites', 'MaxInvites', 'INTEGER', false, null, 0);
@@ -170,6 +176,20 @@ class UserTableMap extends TableMap
      */
     public function buildRelations()
     {
+        $this->addRelation('EmailAddressRelatedByEmail', '\\Eater\\Glim\\Model\\EmailAddress', RelationMap::MANY_TO_ONE, array (
+  0 =>
+  array (
+    0 => ':email',
+    1 => ':id',
+  ),
+), null, null, null, false);
+        $this->addRelation('EmailAddressRelatedByOwner', '\\Eater\\Glim\\Model\\EmailAddress', RelationMap::ONE_TO_MANY, array (
+  0 =>
+  array (
+    0 => ':owner',
+    1 => ':id',
+  ),
+), null, null, 'EmailAddressesRelatedByOwner', false);
         $this->addRelation('Certificate', '\\Eater\\Glim\\Model\\Certificate', RelationMap::ONE_TO_MANY, array (
   0 =>
   array (
@@ -330,6 +350,7 @@ class UserTableMap extends TableMap
             $criteria->addSelectColumn(UserTableMap::COL_ID);
             $criteria->addSelectColumn(UserTableMap::COL_MAX_KEYS);
             $criteria->addSelectColumn(UserTableMap::COL_USERNAME);
+            $criteria->addSelectColumn(UserTableMap::COL_EMAIL);
             $criteria->addSelectColumn(UserTableMap::COL_PASSWORD);
             $criteria->addSelectColumn(UserTableMap::COL_SUPERUSER);
             $criteria->addSelectColumn(UserTableMap::COL_MAX_INVITES);
@@ -338,6 +359,7 @@ class UserTableMap extends TableMap
             $criteria->addSelectColumn($alias . '.id');
             $criteria->addSelectColumn($alias . '.max_keys');
             $criteria->addSelectColumn($alias . '.username');
+            $criteria->addSelectColumn($alias . '.email');
             $criteria->addSelectColumn($alias . '.password');
             $criteria->addSelectColumn($alias . '.superuser');
             $criteria->addSelectColumn($alias . '.max_invites');
@@ -410,7 +432,7 @@ class UserTableMap extends TableMap
     }
 
     /**
-     * Deletes all rows from the User table.
+     * Deletes all rows from the user table.
      *
      * @param ConnectionInterface $con the connection to use
      * @return int The number of affected rows (if supported by underlying database driver).

src/Service/Mail.php

@@ -0,0 +1,64 @@
+<?php
+
+namespace Eater\Glim\Service;
+
+use Eater\Glim\Model\EmailMessage;
+use Eater\Glim\Model\User as UserModel;
+use Nette\Mail\IMailer;
+use Nette\Mail\Message;
+
+class Mail extends Main
+{
+    /**
+     * @param UserModel $user
+     * @param string $template
+     * @param array $context
+     */
+    public function sendFromSystem(UserModel $user, $template, $context)
+    {
+        $message = $this->createEmailMessage($template, $context);
+        $message->setRecipientEmailAddress($user->getEmailAddressRelatedByEmail());
+        $message->save();
+
+        $this->sendEmailMessage($message);
+    }
+
+    /**
+     * @param string $template
+     * @param array $context
+     * @return EmailMessage
+     */
+    public function createEmailMessage($template, $context) {
+        $message = new EmailMessage();
+
+        /** @var \Twig_Environment $twig */
+        $twig = $this->get('twig');
+
+        $txt = $twig->render($template, $context);
+
+        list($subject, $contents) = explode('===', $txt, 2);
+
+        $message->setSubject(trim($subject));
+        $message->setContents(trim($contents));
+
+        return $message;
+    }
+
+    /**
+     * @param EmailMessage $emailMessage
+     */
+    public function sendEmailMessage(EmailMessage $emailMessage)
+    {
+        $mail = new Message();
+        $mail->setSubject($emailMessage->getSubject());
+        $mail->setBody($emailMessage->getContents());
+        $mail->setFrom($emailMessage->getSenderEmail(), $emailMessage->getSenderName());
+        $mail->setReturnPath($emailMessage->getSenderEmail());
+        
+        $mail->addTo($emailMessage->getRecipientEmail(), $emailMessage->getRecipientName());
+        /** @var IMailer $sender */
+        $sender = $this->get('mail-sender');
+
+        $sender->send($mail);
+    }
+}

src/Service/MailSender.php

@@ -0,0 +1,41 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: eater
+ * Date: 6/29/16
+ * Time: 1:15 AM
+ */
+
+namespace Eater\Glim\Service;
+
+
+use Eater\Glim\Core;
+use Nette\Mail\IMailer;
+use Nette\Mail\SendmailMailer;
+use Nette\Mail\SmtpMailer;
+use Slim\Container;
+
+class MailSender
+{
+    /**
+     * @param Container $c
+     * @param string $name
+     * @return IMailer
+     */
+    static public function init($c, $name) {
+        /** @var Core $core */
+        $core = $c->get('core');
+        $config = $core->getConfig();
+        
+        if ($config->get('mail.type', 'sendmail') === 'smtp') {
+            return new SmtpMailer([
+                'host' => $config->get('mail.host', 'localhost'),
+                'secure' => $config->get('mail.secure'),
+                'username' => $config->get('mail.username'),
+                'password' => $config->get('mail.password'),
+            ]);
+        } else {
+            return new SendmailMailer();
+        }
+    }
+}

src/Service/User.php

@@ -2,7 +2,9 @@
 
 namespace Eater\Glim\Service;
 
-use Eater\Glim\Model\Base\UserQuery;
+use Eater\Glim\Core;
+use Eater\Glim\Model\UserQuery;
+use Eater\Glim\Model\EmailAddress;
 use Eater\Glim\Model\InviteQuery;
 use Eater\Glim\Model\Invite;
 use Eater\Glim\Model\User as UserModel;
@@ -12,11 +14,12 @@ class User extends  Main
     /**
      * @param string $invite
      * @param string $username
+     * @param string $email
      * @param string $password
      * @return UserModel
      * @throws \Exception
      */
-    public function register($invite, $username, $password)
+    public function register($invite, $username, $email, $password)
     {
         $invite = InviteQuery::create()->findOneByInvite($invite);
 
@@ -24,12 +27,18 @@ class User extends  Main
             throw new \Exception("Invalid invite code");
         }
 
-        $this->validateUserParams($username, $password);
+        $this->validateUserParams($username,  $email, $password);
 
         $inviteUser = $invite->getUser();
 
         $user = new UserModel();
         $user->setUsername($username);
+
+        $emailAddress = new EmailAddress();
+        $emailAddress->setAddress($email);
+        $emailAddress->fillVerification();
+
+        $user->setEmailAddressRelatedByEmail($emailAddress);
         $user->setPassword(\password_hash($password, PASSWORD_DEFAULT));
 
         if ($inviteUser === null || $inviteUser->getMaxInvites() === -1) {
@@ -42,12 +51,17 @@ class User extends  Main
 
         $user->save();
 
+        $emailAddress->setUserRelatedByOwner($user);
+        $emailAddress->save();
+
+        $this->sendVerifyMail($user);
+
         $invite->delete();
 
         return $user;
     }
 
-    public function validateUserParams($username, $password) {
+    public function validateUserParams($username, $email, $password) {
         if ($username === "") {
             throw new \Exception("No username given");
         }
@@ -56,6 +70,10 @@ class User extends  Main
             throw new \Exception("Username can only consist of a-z, 0-9 and -");
         }
 
+        if (!filter_var($email, FILTER_VALIDATE_EMAIL)) {
+            throw new \Exception("Email is invalid");
+        }
+
         if ($password === "") {
             throw new \Exception("Password is nothing, though strong. we rather not have you use that");
         }
@@ -69,17 +87,27 @@ class User extends  Main
         }
     }
 
-    public function createSuperuser($username, $password) {
+    public function createSuperuser($username, $email, $password) {
 
-        $this->validateUserParams($username, $password);
+        $this->validateUserParams($username, $email, $password);
 
         $user = new UserModel();
         $user->setUsername($username);
         $user->setPassword(\password_hash($password, PASSWORD_DEFAULT));
         $user->setSuperuser(true);
         $user->setMaxInvites(-1);
+
+        $emailAddress = new EmailAddress();
+        $emailAddress->setAddress($email);
+        $emailAddress->fillVerification();
+        $user->setEmailAddressRelatedByEmail($emailAddress);
         $user->save();
 
+        $emailAddress->setUserRelatedByOwner($user);
+        $emailAddress->save();
+        
+        $this->sendVerifyMail($user);
+        
         return $user;
     }
 
@@ -121,4 +149,20 @@ class User extends  Main
 
         return $invite->getInvite();
     }
+
+    /**
+     * @param UserModel $user
+     */
+    private function sendVerifyMail(UserModel $user)
+    {
+        /** @var Mail $mail */
+        $mail = $this->get('mail');
+
+        $address = $user->getEmailAddressRelatedByEmail();
+
+        $mail->sendFromSystem($user, 'mails/verify_email.txt.twig', [
+            'username' => $user->getUsername(),
+            'verificationLink' => $this->get('base-url') . '/verify/' . $address->getId() . '-' . $address->getVerification()
+        ]);
+    }
 }

views/install.html.twig

@@ -11,6 +11,13 @@
                     <div class="row">
                         <h3>Checking for extensions and settings</h3>
                     </div>
+                    <div class="row">
+                        {% if error %}
+                            <div class="alert alert-warning" role="alert">
+                                {{ error }}
+                            </div>
+                        {% endif %}
+                    </div>
                     <div class="row">
                         <table class="table">
                             <tbody>
@@ -48,7 +55,11 @@
                             <div class="row">
                                 <div class="form-group">
                                     <label for="username">Username</label>
-                                    <input id="username" class="form-control" type="text" name="username">
+                                    <input value="{{ username }}" id="username" class="form-control" type="text" name="username">
+                                </div>
+                                <div class="form-group">
+                                    <label for="email">E-mail</label>
+                                    <input value="{{ email }}" id="email" class="form-control" type="text" name="email">
                                 </div>
                                 <div class="form-group">
                                     <label for="password">Password</label>

views/login.html.twig

@@ -11,14 +11,14 @@
 
 <div class="info-page">
   <div class="login-page-form">
-    {% if error %}
+      {% if message %}
-      <div class="alert alert-warning" role="alert">
+        <div class="message" role="alert">
-        {{ error }}
+          {{ message }}
-      </div>
+        </div>
-    {% endif %}
+      {% endif %}
 
-      <form method="post" action="/login">
+      <form method="post" action="{{ action ?? '/login' }}">
-        <input id="username" type="text" placeholder="Username" name="username">
+        <input value="{{ username }}" id="username" type="text" placeholder="Username" name="username">
         <br><br>
         <input id="password" type="password" placeholder="Password" name="password">
         <br><br>

views/mails/verify_email.txt.twig

@@ -0,0 +1,11 @@
+Verify your Zer.ooo account: {{ username }}
+===
+Hey {{ username }},
+
+You successfully created an account on Zer.ooo, please click on the following link to verify your account.
+
+{{ verificationLink }}
+
+Kind regards,
+
+The Zer.ooo team

views/register.html.twig

@@ -18,9 +18,11 @@
         {% endif %}
         
       <form method="post" action="/register">
-        <input id="invite" type="text" placeholder="Invitation code" name="invite">
+        <input id="invite" type="text" placeholder="Invitation code" value="{{ invite }}" name="invite">
         <br><br>
-        <input id="username" type="text" placeholder="Your username" name="username">
+        <input id="email" type="text" value="{{ email }}" placeholder="Your e-mail" name="email">
+        <br><br>
+        <input id="username" type="text" value="{{ username }}" placeholder="Your username" name="username">
         <br><br>
         <input id="password" type="password" placeholder="Password" name="password">
         <br><br>