Added plaintext & basic PDF page Export

@@ -226,13 +226,22 @@ class PageController extends Controller
         return redirect($page->getUrl());
         return redirect($page->getUrl());
     }
     }
 
 
+    /**
+     * Exports a page to pdf format using barryvdh/laravel-dompdf wrapper.
+     * https://github.com/barryvdh/laravel-dompdf
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\Http\Response
+     */
     public function exportPdf($bookSlug, $pageSlug)
     public function exportPdf($bookSlug, $pageSlug)
     {
     {
         $book = $this->bookRepo->getBySlug($bookSlug);
         $book = $this->bookRepo->getBySlug($bookSlug);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
         $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
-        $cssContent = file_get_contents(public_path('/css/styles.css'));
-
-        return $pdf->download($pageSlug . '.pdf');
+        $pdfContent = $this->exportService->pageToPdf($page);
+        return response()->make($pdfContent, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.pdf'
+        ]);
     }
     }
 
 
     /**
     /**
@@ -251,4 +260,22 @@ class PageController extends Controller
             'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html'
             'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.html'
         ]);
         ]);
     }
     }
+
+    /**
+     * Export a page to a simple plaintext .txt file.
+     * @param $bookSlug
+     * @param $pageSlug
+     * @return \Illuminate\Http\Response
+     */
+    public function exportPlainText($bookSlug, $pageSlug)
+    {
+        $book = $this->bookRepo->getBySlug($bookSlug);
+        $page = $this->pageRepo->getBySlug($pageSlug, $book->id);
+        $containedHtml = $this->exportService->pageToPlainText($page);
+        return response()->make($containedHtml, 200, [
+            'Content-Type' => 'application/octet-stream',
+            'Content-Disposition' => 'attachment; filename="'.$pageSlug.'.txt'
+        ]);
+    }
+
 }
 }

@@ -24,6 +24,7 @@ Route::group(['middleware' => 'auth'], function () {
         Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
         Route::get('/{bookSlug}/page/{pageSlug}', 'PageController@show');
         Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf');
         Route::get('/{bookSlug}/page/{pageSlug}/export/pdf', 'PageController@exportPdf');
         Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml');
         Route::get('/{bookSlug}/page/{pageSlug}/export/html', 'PageController@exportHtml');
+        Route::get('/{bookSlug}/page/{pageSlug}/export/plaintext', 'PageController@exportPlainText');
         Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit');
         Route::get('/{bookSlug}/page/{pageSlug}/edit', 'PageController@edit');
         Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
         Route::get('/{bookSlug}/page/{pageSlug}/delete', 'PageController@showDelete');
         Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
         Route::put('/{bookSlug}/page/{pageSlug}', 'PageController@update');
@@ -46,7 +47,6 @@ Route::group(['middleware' => 'auth'], function () {
 
 
     });
     });
 
 
-
     // Users
     // Users
     Route::get('/users', 'UserController@index');
     Route::get('/users', 'UserController@index');
     Route::get('/users/create', 'UserController@create');
     Route::get('/users/create', 'UserController@create');

@@ -6,7 +6,6 @@ use BookStack\Page;
 class ExportService
 class ExportService
 {
 {
 
 
-
     /**
     /**
      * Convert a page to a self-contained HTML file.
      * Convert a page to a self-contained HTML file.
      * Includes required CSS & image content. Images are base64 encoded into the HTML.
      * Includes required CSS & image content. Images are base64 encoded into the HTML.
@@ -16,10 +15,33 @@ class ExportService
     public function pageToContainedHtml(Page $page)
     public function pageToContainedHtml(Page $page)
     {
     {
         $cssContent = file_get_contents(public_path('/css/export-styles.css'));
         $cssContent = file_get_contents(public_path('/css/export-styles.css'));
+        $pageHtml = view('pages/export', ['page' => $page, 'css' => $cssContent])->render();
+        return $this->containHtml($pageHtml);
+    }
+
+    /**
+     * Convert a page to a pdf file.
+     * @param Page $page
+     * @return mixed|string
+     */
+    public function pageToPdf(Page $page)
+    {
+        $cssContent = file_get_contents(public_path('/css/export-styles.css'));
         $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render();
         $pageHtml = view('pages/pdf', ['page' => $page, 'css' => $cssContent])->render();
+        $containedHtml = $this->containHtml($pageHtml);
+        $pdf = \PDF::loadHTML($containedHtml);
+        return $pdf->output();
+    }
 
 
+    /**
+     * Bundle of the contents of a html file to be self-contained.
+     * @param $htmlContent
+     * @return mixed|string
+     */
+    protected function containHtml($htmlContent)
+    {
         $imageTagsOutput = [];
         $imageTagsOutput = [];
-        preg_match_all("/\<img.*src\=(\'|\")(.*?)(\'|\").*?\>/i", $pageHtml, $imageTagsOutput);
+        preg_match_all("/\<img.*src\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $imageTagsOutput);
 
 
         // Replace image src with base64 encoded image strings
         // Replace image src with base64 encoded image strings
         if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
         if (isset($imageTagsOutput[0]) && count($imageTagsOutput[0]) > 0) {
@@ -34,12 +56,12 @@ class ExportService
                 $imageContent = file_get_contents($pathString);
                 $imageContent = file_get_contents($pathString);
                 $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
                 $imageEncoded = 'data:image/' . pathinfo($pathString, PATHINFO_EXTENSION) . ';base64,' . base64_encode($imageContent);
                 $newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
                 $newImageString = str_replace($srcString, $imageEncoded, $oldImgString);
-                $pageHtml = str_replace($oldImgString, $newImageString, $pageHtml);
+                $htmlContent = str_replace($oldImgString, $newImageString, $htmlContent);
             }
             }
         }
         }
 
 
         $linksOutput = [];
         $linksOutput = [];
-        preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $pageHtml, $linksOutput);
+        preg_match_all("/\<a.*href\=(\'|\")(.*?)(\'|\").*?\>/i", $htmlContent, $linksOutput);
 
 
         // Replace image src with base64 encoded image strings
         // Replace image src with base64 encoded image strings
         if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
         if (isset($linksOutput[0]) && count($linksOutput[0]) > 0) {
@@ -49,13 +71,45 @@ class ExportService
                 if (strpos(trim($srcString), 'http') !== 0) {
                 if (strpos(trim($srcString), 'http') !== 0) {
                     $newSrcString = url($srcString);
                     $newSrcString = url($srcString);
                     $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
                     $newLinkString = str_replace($srcString, $newSrcString, $oldLinkString);
-                    $pageHtml = str_replace($oldLinkString, $newLinkString, $pageHtml);
+                    $htmlContent = str_replace($oldLinkString, $newLinkString, $htmlContent);
                 }
                 }
             }
             }
         }
         }
 
 
         // Replace any relative links with system domain
         // Replace any relative links with system domain
-        return $pageHtml;
+        return $htmlContent;
+    }
+
+    /**
+     * Converts the page contents into simple plain text.
+     * This method filters any bad looking content to
+     * provide a nice final output.
+     * @param Page $page
+     * @return mixed
+     */
+    public function pageToPlainText(Page $page)
+    {
+        $text = $page->text;
+        // Replace multiple spaces with single spaces
+        $text = preg_replace('/\ {2,}/', ' ', $text);
+        // Reduce multiple horrid whitespace characters.
+        $text = preg_replace('/(\x0A|\xA0|\x0A|\r|\n){2,}/su', "\n\n", $text);
+        $text = html_entity_decode($text);
+        // Add title
+        $text = $page->name . "\n\n" . $text;
+        return $text;
     }
     }
 
 
-}
\ No newline at end of file
+}
+
+
+
+
+
+
+
+
+
+
+
+

@@ -11,7 +11,8 @@
         "laravel/socialite": "^2.0",
         "laravel/socialite": "^2.0",
         "barryvdh/laravel-ide-helper": "^2.1",
         "barryvdh/laravel-ide-helper": "^2.1",
         "barryvdh/laravel-debugbar": "^2.0",
         "barryvdh/laravel-debugbar": "^2.0",
-        "league/flysystem-aws-s3-v3": "^1.0"
+        "league/flysystem-aws-s3-v3": "^1.0",
+        "barryvdh/laravel-dompdf": "0.6.*"
     },
     },
     "require-dev": {
     "require-dev": {
         "fzaninotto/faker": "~1.4",
         "fzaninotto/faker": "~1.4",

@@ -143,6 +143,7 @@ return [
          * Third Party
          * Third Party
          */
          */
         Intervention\Image\ImageServiceProvider::class,
         Intervention\Image\ImageServiceProvider::class,
+        Barryvdh\DomPDF\ServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
         Barryvdh\LaravelIdeHelper\IdeHelperServiceProvider::class,
         Barryvdh\Debugbar\ServiceProvider::class,
         Barryvdh\Debugbar\ServiceProvider::class,
 
 
@@ -210,6 +211,7 @@ return [
          */
          */
 
 
         'ImageTool' => Intervention\Image\Facades\Image::class,
         'ImageTool' => Intervention\Image\Facades\Image::class,
+        'PDF' => Barryvdh\DomPDF\Facade::class,
         'Debugbar'  => Barryvdh\Debugbar\Facade::class,
         'Debugbar'  => Barryvdh\Debugbar\Facade::class,
 
 
         /**
         /**

@@ -161,6 +161,12 @@ form.search-box {
   padding: $-xs 0;
   padding: $-xs 0;
   color: #555;
   color: #555;
   text-align: left !important;
   text-align: left !important;
+  &.wide {
+    min-width: 220px;
+  }
+  .text-muted {
+    color: #999;
+  }
   a {
   a {
     display: block;
     display: block;
     padding: $-xs $-m;
     padding: $-xs $-m;

@@ -27,8 +27,8 @@ $-xs: 6px;
 $-xxs: 3px;
 $-xxs: 3px;
 
 
 // Fonts
 // Fonts
-$heading:  'Roboto', Helvetica, Arial, sans-serif;
-$text: 'Roboto', Helvetica, Arial, sans-serif;
+$heading:  'Roboto', 'DejaVu Sans', Helvetica,  Arial, sans-serif;
+$text: 'Roboto', 'DejaVu Sans', Helvetica,  Arial, sans-serif;
 $fs-m: 15px;
 $fs-m: 15px;
 $fs-s: 14px;
 $fs-s: 14px;
 
 

-@import "reset";
+//@import "reset";
 @import "variables";
 @import "variables";
 @import "mixins";
 @import "mixins";
 @import "html";
 @import "html";

+<!doctype html>
+<html lang="en">
+<head>
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+    <title>{{ $page->name }}</title>
+
+    <style>
+        {!! $css !!}
+    </style>
+    @yield('head')
+</head>
+<body>
+<div class="container" id="page-show">
+    <div class="row">
+        <div class="col-md-8 col-md-offset-2">
+            <div class="page-content">
+
+                @include('pages/page-display')
+
+                <hr>
+
+                <p class="text-muted small">
+                    Created {{$page->created_at->toDayDateTimeString()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif
+                    <br>
+                    Last Updated {{$page->updated_at->toDayDateTimeString()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
+                </p>
+
+            </div>
+        </div>
+    </div>
+</div>
+</body>
+</html>

-<!doctype html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>{{ $page->name }}</title>
+@extends('pages/export')
 
 
+@section('head')
     <style>
     <style>
-        {!! $css !!}
-    </style>
-</head>
-<body>
-<div class="container" id="page-show" ng-non-bindable>
-    <div class="row">
-        <div class="col-md-8 col-md-offset-2">
-            <div class="page-content">
-
-                @include('pages/page-display')
+        body {
+            font-size: 15px;
+            line-height: 1;
+        }
 
 
-                <hr>
+        h1, h2, h3, h4, h5, h6 {
+            line-height: 1;
+        }
 
 
-                <p class="text-muted small">
-                    Created {{$page->created_at->diffForHumans()}} @if($page->createdBy) by {{$page->createdBy->name}} @endif
-                    <br>
-                    Last Updated {{$page->updated_at->diffForHumans()}} @if($page->updatedBy) by {{$page->updatedBy->name}} @endif
-                </p>
+        table {
+            max-width: 800px !important;
+            font-size: 0.8em;
+            width: auto !important;
+        }
 
 
-            </div>
-        </div>
-    </div>
-</div>
-</body>
-</html>
+        table td {
+            width: auto !important;
+        }
+    </style>
+@stop
\ No newline at end of file

@@ -20,9 +20,11 @@
                 <div class="col-sm-6 faded">
                 <div class="col-sm-6 faded">
                     <div class="action-buttons">
                     <div class="action-buttons">
                         <span dropdown class="dropdown-container">
                         <span dropdown class="dropdown-container">
-                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export Page</div>
-                            <ul>
-                                <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained HTML File</a></li>
+                            <div dropdown-toggle class="text-button text-primary"><i class="zmdi zmdi-open-in-new"></i>Export</div>
+                            <ul class="wide">
+                                <li><a href="{{$page->getUrl() . '/export/html'}}" target="_blank">Contained Web File <span class="text-muted pull-right">.html</span></a></li>
+                                <li><a href="{{$page->getUrl() . '/export/pdf'}}" target="_blank">PDF File <span class="text-muted pull-right">.pdf</span></a></li>
+                                <li><a href="{{$page->getUrl() . '/export/plaintext'}}" target="_blank">Plain Text File <span class="text-muted pull-right">.txt</span></a></li>
                             </ul>
                             </ul>
                         </span>
                         </span>
                         @if($currentUser->can('page-update'))
                         @if($currentUser->can('page-update'))

+*
+!.gitignore
\ No newline at end of file