From 914287873b7a5e8bdcacde30f353410d793cb753 Mon Sep 17 00:00:00 2001 From: Corne Oppelaar Date: Sat, 25 Jun 2016 15:48:42 +0200 Subject: [PATCH] add error to install --- db.sqlite | 0 src/Handler/Install/Show.php | 7 ++++++- views/install.html.twig | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 db.sqlite diff --git a/db.sqlite b/db.sqlite new file mode 100644 index 0000000..e69de29 diff --git a/src/Handler/Install/Show.php b/src/Handler/Install/Show.php index 1e98f52..7601766 100644 --- a/src/Handler/Install/Show.php +++ b/src/Handler/Install/Show.php @@ -23,13 +23,18 @@ 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), - 'hostnameWithPort' => $_SERVER['HTTP_HOST'] + 'hostnameWithPort' => $_SERVER['HTTP_HOST'], + 'error' => $segment->getFlash('error') ]; return $this->render('install.html.twig', $data); diff --git a/views/install.html.twig b/views/install.html.twig index 4ebb76e..88bbf59 100644 --- a/views/install.html.twig +++ b/views/install.html.twig @@ -11,6 +11,13 @@

Checking for extensions and settings

+
+ {% if error %} + + {% endif %} +