Code refactoring

Blogify · May 23, 2015 · 1944414 · 1944414
1 parent 3d2e948
commit 1944414
Show file tree

Hide file tree

Showing 20 changed files with 120 additions and 91 deletions.
diff --git a/src/Commands/BlogifyGeneratePublicPartCommand.php b/src/Commands/BlogifyGeneratePublicPartCommand.php
@@ -126,12 +126,14 @@ private function publishTemplates($namespace)
      */
     private function publishViews()
     {
-        $path = __DIR__."/../../../../../resources/views/blogify/templates/";
+        $basepath = __DIR__."/../../../../../resources/views/blogify/";
+        $path = $basepath."templates/";
+
         if (!file_exists($path)) mkdir($path, 775, true);
 
         foreach ($this->views as $key => $file)
         {
-            $filename = __DIR__."/../../../../../resources/views/blogify/$key.blade.php";
+            $filename = $basepath . "$key.blade.php";
             if (file_exists($filename))
             {
                 if ($this->confirm("File $key allready exists, do you want to override it? Y/N"))
@@ -147,7 +149,7 @@ private function publishViews()
 
         foreach ($this->layouts as $key => $file)
         {
-            $filename = __DIR__."/../../../../../resources/views/blogify/templates/$key.blade.php";
+            $filename = $basepath . "templates/$key.blade.php";
             if (file_exists($filename))
             {
                 if ($this->confirm("File $key allready exists, do you want to override it? Y/N"))

diff --git a/src/Commands/BlogifyMigrateCommand.php b/src/Commands/BlogifyMigrateCommand.php
@@ -2,7 +2,8 @@
 
 use Illuminate\Console\Command;
 
-class BlogifyMigrateCommand extends Command {
+class BlogifyMigrateCommand extends Command
+{
 
     /**
      * The console command name.

diff --git a/src/Controllers/Admin/ApiController.php b/src/Controllers/Admin/ApiController.php
@@ -49,12 +49,12 @@ public function __construct(Post $post)
      */
     public function sort($table, $column, $order, $trashed = false, DatabaseManager $db)
     {
-        $data = $db->table( $table );
+        $data = $db->table($table);
 
         // Check for trashed data
         $data = $trashed ? $data->whereNotNull('deleted_at') : $data->whereNull('deleted_at');
 
-        $data = $data->orderBy($column, $order)->paginate( $this->config->items_per_page );
+        $data = $data->orderBy($column, $order)->paginate($this->config->items_per_page);
 
         return $data;
     }
@@ -74,7 +74,7 @@ public function checkIfSlugIsUnique($slug)
         while ($this->post->whereSlug($slug)->get()->count() > 0)
         {
             $i++;
-            $slug = $this->base_slug . '-' . $i;
+            $slug = "$this->base_slug-$i";
         }
 
         return $slug;

diff --git a/src/Controllers/Admin/BaseController.php b/src/Controllers/Admin/BaseController.php
@@ -31,4 +31,5 @@ public function __construct()
         $this->config       = objectify( config('blogify') );
         $this->auth_user    = $this->auth->check() ? $this->auth->user() : false;
     }
+
 }
diff --git a/src/Controllers/Admin/CategoriesController.php b/src/Controllers/Admin/CategoriesController.php
@@ -123,7 +123,7 @@ public function update ($hash, CategoryRequest $request)
      */
     public function destroy($hash)
     {
-        $category = $this->category->byHash( $hash );
+        $category = $this->category->byHash($hash);
         $category_name = $category->name;
         $category->delete();
 
@@ -163,7 +163,7 @@ public function restore($hash)
      */
     private function storeOrUpdateCategory($request)
     {
-        $cat = $this->category->whereName( $request->name )->first();
+        $cat = $this->category->whereName($request->name)->first();
 
         if (count($cat) > 0)
         {

diff --git a/src/Controllers/Admin/CommentsController.php b/src/Controllers/Admin/CommentsController.php
@@ -37,11 +37,11 @@ public function __construct(Comment $comment)
      */
     public function index($revised = "pending")
     {
-        $revised = $this->checkRevised( $revised );
+        $revised = $this->checkRevised($revised);
         if ($revised === false) abort(404);
 
         $data = [
-            'comments' => $this->comment->byRevised( $revised )->paginate( $this->config->items_per_page ),
+            'comments' => $this->comment->byRevised($revised)->paginate($this->config->items_per_page),
             'revised' => $revised,
         ];
 
@@ -65,7 +65,7 @@ public function changeStatus($hash, $new_revised)
         $revised = $this->checkRevised( $new_revised );
         if ($revised === false) abort(404);
 
-        $comment            = $this->comment->byHash( $hash );
+        $comment            = $this->comment->byHash($hash);
         $comment->revised   = $revised;
         $comment->save();
 
@@ -90,7 +90,7 @@ public function changeStatus($hash, $new_revised)
      */
     private function checkRevised($revised)
     {
-        $allowed = [1 => 'pending', Ò2 => 'approved', 3 => 'disapproved'];
+        $allowed = [1 => 'pending', 2 => 'approved', 3 => 'disapproved'];
 
         return array_search($revised, $allowed);
     }

diff --git a/src/Controllers/Admin/PostsController.php b/src/Controllers/Admin/PostsController.php
@@ -144,7 +144,15 @@ public function index($trashed = false)
     {
         $scope  = 'for'.$this->auth_user->role->name;
         $data   = [
-            'posts' => (! $trashed) ? $this->post->$scope()->orderBy('publish_date', 'DESC')->paginate($this->config->items_per_page) : $this->post->$scope()->onlyTrashed()->orderBy('publish_date', 'DESC')->paginate($this->config->items_per_page),
+            'posts' => (! $trashed) ?
+                                    $this->post->$scope()
+                                            ->orderBy('publish_date', 'DESC')
+                                            ->paginate($this->config->items_per_page)
+                                    :
+                                    $this->post->$scope()
+                                            ->onlyTrashed()
+                                            ->orderBy('publish_date', 'DESC')
+                                            ->paginate($this->config->items_per_page),
             'trashed' => $trashed,
         ];
 
@@ -171,10 +179,10 @@ public function create()
      * @param $slug
      * @return \Illuminate\View\View
      */
-    public function show ( $slug )
+    public function show ($slug)
     {
         $data = [
-            'post' => $this->post->bySlug( $slug ),
+            'post' => $this->post->bySlug($slug),
         ];
 
         if ($data['post']->count() <= 0) abort(404);
@@ -190,13 +198,13 @@ public function show ( $slug )
      */
     public function edit($hash)
     {
-        $p      = $this->post->byHash($hash);
-        $hash   = $this->auth_user->hash;
-        $post   = ($this->cache->has("autoSavedPost-$hash")) ? $this->buildPostObject() : $p;
-        $data   = $this->getViewData( $post );
+        $originalPost = $this->post->byHash($hash);
+        $hash = $this->auth_user->hash;
+        $post = ($this->cache->has("autoSavedPost-$hash")) ? $this->buildPostObject() : $originalPost;
+        $data = $this->getViewData($post);
 
-        $p->being_edited_by = $this->auth_user->id;
-        $p->save();
+        $originalPost->being_edited_by = $this->auth_user->id;
+        $originalPost->save();
 
         return view('blogify::admin.posts.form', $data);
     }
@@ -220,14 +228,15 @@ public function store(PostRequest $request)
 
         $post = $this->storeOrUpdatePost();
 
-        if ($this->status->byHash($this->data->status)->name == 'Pending review') $this->mailReviewer( $post );
+        if ($this->status->byHash($this->data->status)->name == 'Pending review') $this->mailReviewer($post);
 
         $action = ($request->hash == '') ? 'created' : 'updated';
 
         tracert()->log('posts', $post->id, $this->auth_user->id, $action);
 
         $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $post->title, 'action' => $action]);
         session()->flash('notify', ['success', $message]);
+
         $this->cache->forget('autoSavedPost');
 
         return redirect()->route('admin.posts.index');
@@ -242,13 +251,11 @@ public function store(PostRequest $request)
     public function destroy($hash)
     {
         $post = $this->post->byHash($hash);
-        $name = $post->title;
-
         $post->delete();
 
         tracert()->log('posts', $post->id, $this->auth_user->id, 'delete');
 
-        $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $name, 'action' =>'deleted']);
+        $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $post->title, 'action' =>'deleted']);
         session()->flash('notify', ['success', $message]);
 
         return redirect()->route('admin.posts.index');
@@ -267,7 +274,7 @@ public function destroy($hash)
      */
     public function uploadImage(ImageUploadRequest $request)
     {
-        $image_name = $this->resizeAnsSaveImage( $request->file('upload') );
+        $image_name = $this->resizeAndSaveImage($request->file('upload'));
         $path       = config()->get('app.url').'/uploads/posts/' . $image_name;
         $func       = $request->get('CKEditorFuncNum');
         $result     = "<script>window.parent.CKEDITOR.tools.callFunction($func, '$path', 'Image has been uploaded')</script>";
@@ -306,10 +313,9 @@ public function cancel($hash = null)
     public function restore($hash)
     {
         $post = $this->post->withTrashed()->byHash($hash);
-        $post_title = $post->title;
         $post->restore();
 
-        $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $post_title, 'action' =>'restored']);
+        $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $post->title, 'action' =>'restored']);
         session()->flash('notify', ['success', $message]);
 
         return redirect()->route('admin.posts.index');
@@ -370,7 +376,7 @@ private function getViewData($post = null)
      * @param $image
      * @return string
      */
-    private function resizeAnsSaveImage($image)
+    private function resizeAndSaveImage($image)
     {
         $image_name = $this->createImageName();
         $fullpath = $this->createFullImagePath($image_name, $image->getClientOriginalExtension());
@@ -501,11 +507,11 @@ private function buildPostObject()
         $post['short_description']  = $cached_post['short_description'];
         $post['content']            = $cached_post['content'];
         $post['publish_date']       = $cached_post['publishdate'];
-        $post['status_id']          = $this->status->byHash( $cached_post['status'] )->id;
-        $post['visibility_id']      = $this->visibility->byHash( $cached_post['visibility'] )->id;
-        $post['reviewer_id']        = $this->user->ByHash( $cached_post['reviewer'] )->id;
-        $post['category_id']        = $this->category->byHash( $cached_post['category'] )->id;
-        $post['tag']                = $this->buildTagsArrayForPostObject( $cached_post['tags'] );
+        $post['status_id']          = $this->status->byHash($cached_post['status'])->id;
+        $post['visibility_id']      = $this->visibility->byHash($cached_post['visibility'])->id;
+        $post['reviewer_id']        = $this->user->byHash($cached_post['reviewer'])->id;
+        $post['category_id']        = $this->category->byHash($cached_post['category'])->id;
+        $post['tag']                = $this->buildTagsArrayForPostObject($cached_post['tags']);
 
         return objectify($post);
     }
@@ -521,14 +527,14 @@ private function buildTagsArrayForPostObject($tags)
     {
         if ($tags == "") return [];
 
-        $t      = [];
-        $tags   = explode(',', $tags);
+        $aTags      = [];
+        $hashes   = explode(',', $tags);
 
-        foreach ($tags as $tag)
+        foreach ($hashes as $tag)
         {
-            array_push($t, $this->tag->byHash($tag));
+            array_push($aTags, $this->tag->byHash($tag));
         }
 
-        return $t;
+        return $aTags;
     }
 }
diff --git a/src/Controllers/Admin/ProfileController.php b/src/Controllers/Admin/ProfileController.php
@@ -122,12 +122,12 @@ private function resizeAndSaveProfilePicture($image, $filename)
         $extention  = $image->getClientOriginalExtension();
         $fullpath   = $this->config->upload_paths->profiles->profilepictures . $filename . '.' . $extention;
 
-        Image::make( $image->getRealPath() )
-            ->resize( $this->config->image_sizes->profilepictures[0], $this->config->image_sizes->profilepictures[1] , function ($constraint) {
+        Image::make($image->getRealPath())
+            ->resize($this->config->image_sizes->profilepictures[0], $this->config->image_sizes->profilepictures[1] , function ($constraint) {
                 $constraint->aspectRatio();
                 $constraint->upsize();
             })
-            ->save( $fullpath );
+            ->save($fullpath);
 
         return $fullpath;
     }
@@ -140,10 +140,7 @@ private function resizeAndSaveProfilePicture($image, $filename)
      */
     private function removeOldPicture($oldPicture)
     {
-        if (file_exists($oldPicture))
-        {
-            unlink($oldPicture);
-        }
+        if (file_exists($oldPicture)) unlink($oldPicture);
     }
 
 }
diff --git a/src/Controllers/Admin/TagsController.php b/src/Controllers/Admin/TagsController.php
@@ -1,6 +1,5 @@
 <?php namespace jorenvanhocht\Blogify\Controllers\Admin;
 
-use Illuminate\Support\Facades\Config;
 use Input;
 use jorenvanhocht\Blogify\Models\Tag;
 use jorenvanhocht\Blogify\Requests\TagUpdateRequest;
@@ -55,7 +54,13 @@ public function __construct(Tag $tag)
     public function index($trashed = null)
     {
         $data = [
-            'tags' => (! $trashed) ? $this->tag->orderBy('created_at', 'DESC')->paginate($this->config->items_per_page) : $this->tag->onlyTrashed()->orderBy('created_at', 'DESC')->paginate($this->config->items_per_page),
+            'tags' => (! $trashed) ?
+                                    $this->tag->orderBy('created_at', 'DESC')
+                                        ->paginate($this->config->items_per_page)
+                                    :
+                                    $this->tag->onlyTrashed()
+                                        ->orderBy('created_at', 'DESC')
+                                        ->paginate($this->config->items_per_page),
             'trashed' => $trashed,
         ];
 
@@ -137,7 +142,7 @@ public function storeOrUpdate()
      */
     public function update($hash, TagUpdateRequest $request)
     {
-        $tag = $this->tag->byHash( $hash );
+        $tag = $this->tag->byHash($hash);
         $tag->name = $request->tags;
         $tag->save();
 
@@ -158,12 +163,11 @@ public function update($hash, TagUpdateRequest $request)
     public function destroy($hash)
     {
         $tag = $this->tag->byHash($hash);
-        $tag_name = $tag->name;
         $tag->delete();
 
         tracert()->log('tags', $tag->id, $this->auth_user->id, 'delete');
 
-        $message = trans('blogify::notify.success', ['model' => 'Tags', 'name' => $tag_name, 'action' =>'deleted']);
+        $message = trans('blogify::notify.success', ['model' => 'Tags', 'name' => $tag->name, 'action' =>'deleted']);
         session()->flash('notify', ['success', $message]);
 
         return redirect()->route('admin.tags.index');
@@ -176,10 +180,9 @@ public function destroy($hash)
     public function restore($hash)
     {
         $tag = $this->tag->withTrashed()->byHash($hash);
-        $tag_name = $tag->name;
         $tag->restore();
 
-        $message = trans('blogify::notify.success', ['model' => 'Post', 'name' => $tag_name, 'action' =>'restored']);
+        $message = trans('blogify::notify.success', ['model' => 'Tag', 'name' => $tag->name, 'action' =>'restored']);
         session()->flash('notify', ['success', $message]);
 
         return redirect()->route('admin.tags.index');