Merge branch 'editor-update'

# Conflicts:
#	README.md

Author: samberrry

README.md

@@ -147,6 +147,8 @@ After upgraded to latest version follows these steps:
 ## Version History
 - 7.2.1                 - adds reading progress bar feature (if you upgrade, re-publish config file and view files)
 - 7.2.0                 - adds sub-category functionality to blog
+- 7.1.8                 - ability to remove images from posts (this feature does not work for old posts)
+- 7.1.7                 - updates CKEditor
 - 7.1.5                 - minor fix for recent posts
 - 7.1.4                 - updates fulltext search package which solves the search issue
 - 7.1.2                 - shows categories on blog home page - minor fix (if you upgrade try to re-publish view files)

src/Controllers/BlogEtcAdminController.php

@@ -126,6 +126,41 @@ public function update_post(UpdateBlogEtcPostRequest $request, $blogPostId)
 
     }
 
+    public function remove_photo($postSlug)
+    {
+        $post = BlogEtcPost::where("slug", $postSlug)->firstOrFail();
+
+        $path = public_path('/' . config("blogetc.blog_upload_dir"));
+        if (!$this->checked_blog_image_dir_is_writable) {
+            if (!is_writable($path)) {
+                throw new \RuntimeException("Image destination path is not writable ($path)");
+            }
+        }
+
+        $destinationPath = $this->image_destination_path();
+
+        if (file_exists($destinationPath.'/'.$post->image_large)) {
+            unlink($destinationPath.'/'.$post->image_large);
+        }
+
+        if (file_exists($destinationPath.'/'.$post->image_medium)) {
+            unlink($destinationPath.'/'.$post->image_medium);
+        }
+
+        if (file_exists($destinationPath.'/'.$post->image_thumbnail)) {
+            unlink($destinationPath.'/'.$post->image_thumbnail);
+        }
+
+        $post->image_large = null;
+        $post->image_medium = null;
+        $post->image_thumbnail = null;
+        $post->save();
+
+        Helpers::flash_message("Photo removed");
+
+        return redirect($post->edit_url());
+    }
+
     /**
      * Delete a post
      *
@@ -176,14 +211,13 @@ protected function processUploadedImages(BaseRequestInterface $request, BlogEtcP
                 // this image size is enabled, and
                 // we have an uploaded image that we can use
 
-                $uploaded_image = $this->UploadAndResize($new_blog_post, $new_blog_post->title, $image_size_details, $photo);
+                $uploaded_image = $this->UploadAndResize($new_blog_post, $new_blog_post->slug, $image_size_details, $photo);
 
                 $new_blog_post->$size = $uploaded_image['filename'];
                 $uploaded_image_details[$size] = $uploaded_image;
             }
         }
 
-
         // store the image upload.
         // todo: link this to the blogetc_post row.
         if (count(array_filter($uploaded_image_details))>0) {
@@ -192,9 +226,5 @@ protected function processUploadedImages(BaseRequestInterface $request, BlogEtcP
                 'uploaded_images' => $uploaded_image_details,
             ]);
         }
-
-
     }
-
-
 }

src/Views/blogetc_admin/layouts/admin_layout.blade.php

@@ -121,9 +121,7 @@
 
 
 @if( config("blogetc.use_wysiwyg") && config("blogetc.echo_html") && (in_array( \Request::route()->getName() ,[ 'blogetc.admin.create_post' , 'blogetc.admin.edit_post'  ])))
-    <script src="https://cdn.ckeditor.com/4.10.0/standard/ckeditor.js"
-            integrity="sha384-BpuqJd0Xizmp9PSp/NTwb/RSBCHK+rVdGWTrwcepj1ADQjNYPWT2GDfnfAr6/5dn"
-            crossorigin="anonymous"></script>
+    <script src="//cdn.ckeditor.com/4.14.1/full/ckeditor.js"></script>
     <script>
         if( typeof(CKEDITOR) !== "undefined" ) {
             CKEDITOR.replace('post_body');

src/Views/blogetc_admin/posts/form.blade.php

@@ -84,15 +84,12 @@
               name='post_body'>{{old("post_body",$post->post_body)}}</textarea>
 
 
-    <div class='alert alert-danger'>
-        Please note that any HTML (including any JS code) that is entered here will be
-        echoed (without escaping)
+    <div class='alert alert-warning'>
+        If you want to add HTML content to be rendered, click source button at top left, and then paste your HTML snippet. (Youtube iFrames)
     </div>
 </div>
 
 
-
-
 @if(config("blogetc.use_custom_view_files",true))
     <div class="form-group">
         <label for="blog_use_view_file">Custom View File</label>
@@ -162,7 +159,9 @@
                 <input class="form-control" type="file" name="{{$size_key}}" id="blog_{{$size_key}}"
                        aria-describedby="blog_{{$size_key}}_help">
 
-
+                @if($post->has_image($size_info['basic_key']))
+                    <a style="color: darkred" href="{{route("blogetc.admin.remove_photo", $post->slug)}}">Remove Image</a>
+                @endif
             </div>
         @endforeach
 

src/routes.php

@@ -63,6 +63,10 @@
             'BlogEtcAdminController@update_post')
             ->name('blogetc.admin.update_post');
 
+        //Removes post's photo
+        Route::get('/remove_photo/{slug}',
+            'BlogEtcAdminController@remove_photo')
+            ->name('blogetc.admin.remove_photo');
 
         Route::group(['prefix' => "image_uploads",], function () {