Reverted travis changes and added html escaping

diff --git a/.travis.yml b/.travis.yml
index f03865201492e3657b2d8b7b59023f090dc6af7a..839d3be3f951a83f0f0b3e35855c069ca6bce232 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,15 +4,6 @@ language: php
 php:
   - 7.0
 
 php:
   - 7.0
 

-addons:
-  apt:
-    packages:
-      - ldap-utils
-      - slapd
-
-before_install:
-  - echo "extension=ldap.so" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-

 cache:
   directories:
     - $HOME/.composer/cache
 cache:
   directories:
     - $HOME/.composer/cache


@@ -34,4 +25,4 @@ after_failure:
   - cat storage/logs/laravel.log
 
 script:
   - cat storage/logs/laravel.log
 
 script:

-  - phpunit --stop-on-error --stop-on-failure
+  - phpunit

diff --git a/resources/views/books/show.blade.php b/resources/views/books/show.blade.php
index b6a9bcfbaf8592593c98437cdbe6b4df5910a7dc..9882f09a2085ab1855efddc13b6dade37d3c9901 100644 (file)
--- a/resources/views/books/show.blade.php
+++ b/resources/views/books/show.blade.php
@@ -56,7 +56,7 @@
 
                 <h1>{{$book->name}}</h1>
                 <div class="book-content" v-if="!searching">
 
                 <h1>{{$book->name}}</h1>
                 <div class="book-content" v-if="!searching">

-                    <p class="text-muted" v-pre>{!! nl2br($book->description) !!}</p>
+                    <p class="text-muted" v-pre>{!! nl2br(e($book->description)) !!}</p>

 
                     <div class="page-list" v-pre>
                         <hr>
 
                     <div class="page-list" v-pre>
                         <hr>

diff --git a/resources/views/chapters/show.blade.php b/resources/views/chapters/show.blade.php
index 5b36037ca1f52c0a2cfdcf16c10b3c3cf40c0310..9a319555595cda2ff105a6985c0f5f4cd4551b27 100644 (file)
--- a/resources/views/chapters/show.blade.php
+++ b/resources/views/chapters/show.blade.php
@@ -52,7 +52,7 @@
             <div class="col-md-7">
                 <h1>{{ $chapter->name }}</h1>
                 <div class="chapter-content" v-if="!searching">
             <div class="col-md-7">
                 <h1>{{ $chapter->name }}</h1>
                 <div class="chapter-content" v-if="!searching">

-                    <p class="text-muted">{!! nl2br($chapter->description) !!}</p>
+                    <p class="text-muted">{!! nl2br(e($chapter->description)) !!}</p>

 
                     @if(count($pages) > 0)
                         <div class="page-list">
 
                     @if(count($pages) > 0)
                         <div class="page-list">