From 7b8fda4f108e25c56a236a0bc01f3a3322b9bd82 Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Sat, 25 Jun 2016 17:02:39 +0200 Subject: [PATCH] add email to register and also save input status after error --- src/Handler/Install/Action.php | 7 ++++++- src/Handler/Install/Show.php | 8 +++++--- src/Handler/Login/Action.php | 1 + src/Handler/Login/Show.php | 1 + src/Handler/Register/Action.php | 7 ++++++- src/Handler/Register/Show.php | 10 +++++++--- views/install.html.twig | 6 +++++- views/login.html.twig | 2 +- views/register.html.twig | 6 ++++-- 9 files changed, 36 insertions(+), 12 deletions(-) diff --git a/src/Handler/Install/Action.php b/src/Handler/Install/Action.php index a8386e0..76ded02 100644 --- a/src/Handler/Install/Action.php +++ b/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'); } diff --git a/src/Handler/Install/Show.php b/src/Handler/Install/Show.php index 7601766..cf43a1d 100644 --- a/src/Handler/Install/Show.php +++ b/src/Handler/Install/Show.php @@ -32,9 +32,11 @@ class Show extends Main 'hasOpenSsl' => $hasOpenSsl, 'hasOpenSslExtension' => extension_loaded('openssl'), 'hasZipExtension' => extension_loaded('zip'), - 'hostname' => parse_url($_SERVER['HTTP_HOST'], PHP_URL_HOST), - 'hostnameWithPort' => $_SERVER['HTTP_HOST'], - 'error' => $segment->getFlash('error') + 'hostname' => $segment->getFlash('hostname', parse_url($_SERVER['HTTP_HOST'], PHP_URL_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); diff --git a/src/Handler/Login/Action.php b/src/Handler/Login/Action.php index 00a0006..dbcc95e 100644 --- a/src/Handler/Login/Action.php +++ b/src/Handler/Login/Action.php @@ -29,6 +29,7 @@ class Action extends Main if ($loggedUser === null) { $segment->setFlash("error", "Login failed, username or password are incorrect"); + $segment->setFlash('username', $username); return $this->redirect('/login'); } diff --git a/src/Handler/Login/Show.php b/src/Handler/Login/Show.php index a4f1e66..0441628 100644 --- a/src/Handler/Login/Show.php +++ b/src/Handler/Login/Show.php @@ -35,6 +35,7 @@ class Show extends Main /** @var Segment $segment */ $segment = $this->get('session')->getSegment('main'); + $this->get('twig-vars')->def('username', $segment->getFlash('username')); $this->get('twig-vars')->def('error', $segment->getFlash('error')); return $this->render( diff --git a/src/Handler/Register/Action.php b/src/Handler/Register/Action.php index 3a736af..8716432 100644 --- a/src/Handler/Register/Action.php +++ b/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'); } diff --git a/src/Handler/Register/Show.php b/src/Handler/Register/Show.php index 6dd7648..471ed27 100644 --- a/src/Handler/Register/Show.php +++ b/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'); + return $this->render('register.html.twig', [ + 'error' => $segment->getFlash('error'), + 'username' => $segment->getFlash('username'), + 'invite' => $segment->getFlash('invite'), + 'email' => $segment->getFlash('email') + ]); } } \ No newline at end of file diff --git a/views/install.html.twig b/views/install.html.twig index 88bbf59..4f3c3b9 100644 --- a/views/install.html.twig +++ b/views/install.html.twig @@ -55,7 +55,11 @@
- + +
+
+ +
diff --git a/views/login.html.twig b/views/login.html.twig index 856fa94..5d3b21a 100644 --- a/views/login.html.twig +++ b/views/login.html.twig @@ -18,7 +18,7 @@ {% endif %}
- +



diff --git a/views/register.html.twig b/views/register.html.twig index 5e78d15..f07b127 100644 --- a/views/register.html.twig +++ b/views/register.html.twig @@ -18,9 +18,11 @@ {% endif %} - +

- + +

+