Installer: Prevent crash when views directory is not writable

Use plain PHP templates instead of Blade templates so there is nothing that needs to be written. closes #376
flarum · Aug 31, 2015 · 5e22458 · 5e22458 · franzliedke · Aug 31, 2015
1 parent c72bdc8
commit 5e22458
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 20 deletions.
diff --git a/src/Install/Actions/IndexAction.php b/src/Install/Actions/IndexAction.php
@@ -38,8 +38,6 @@ public function render(Request $request, array $routeParams = [])
     {
         $view = $this->view->make('flarum.install::app');
 
-        $view->logo = $this->view->make('flarum.install::logo');
-
         $errors = [];
 
         if (version_compare(PHP_VERSION, '5.5.0', '<')) {

diff --git a/views/install/app.blade.php → views/install/app.php b/views/install/app.blade.php → views/install/app.php
@@ -162,11 +162,11 @@
   <body>
     <div class="container">
       <h1>
-        {!! $logo !!}
+        <?php include 'logo.svg'; ?>
       </h1>
 
       <div class="animated fadeIn">
-        {!! $content !!}
+        <?php echo $content; ?>
       </div>
     </div>
   </body>

diff --git a/views/install/errors.blade.php b/views/install/errors.blade.php
diff --git a/views/install/errors.php b/views/install/errors.php
@@ -0,0 +1,14 @@
+<h2>Hold Up!</h2>
+
+<p>These errors must be resolved before you can continue the installation. If you're having trouble, get help on the <a href="http://flarum.org/docs/installation" target="_blank">Flarum website</a>.</p>
+
+<div class="Errors">
+  <?php foreach ($errors as $error): ?>
+    <div class="Error">
+      <h3 class="Error-message"><?php echo $error['message']; ?></h3>
+      <?php if (! empty($error['detail'])): ?>
+        <p class="Error-detail"><?php echo $error['detail']; ?></p>
+      <?php endif; ?>
+    </div>
+  <?php endforeach; ?>
+</div>
diff --git a/views/install/install.blade.php → views/install/install.php b/views/install/install.blade.php → views/install/install.php
@@ -1,6 +1,6 @@
 <h2>Install Flarum</h2>
 
-<p>Set up your forum by filling out your details below. If you have any trouble, get help on the <a href="http://flarum.org/docs/troubleshooting" target="_blank">Flarum website</a>.</p>
+<p>Set up your forum by filling out your details below. If you have any trouble, get help on the <a href="http://flarum.org/docs/installation" target="_blank">Flarum website</a>.</p>
 
 <form>
   <div id="error" style="display:none"></div>

diff --git a/views/install/logo.php → views/install/logo.svg b/views/install/logo.php → views/install/logo.svg