Make numerous improvements and tidy up formatting

Author: Riari

readme.md

@@ -38,6 +38,7 @@ This package is currently under heavy development. Feel free to post issues and
  * Multilingual (English and French translations available out of the box)
 
 ### Planned features
+
  * Read/unread thread status (with icons and 'new posts' page)
 
 ### Demo
@@ -111,7 +112,7 @@ You can then adjust the views however you like. I suggest editing the master vie
 
 ### Regarding permissions
 
-The default permission callbacks don't allow users to perform certain actions such as deleting threads or posts; you'll need to modify them to return TRUE based on your own criteria. For example, if you use [Zizaco/entrust](https://github.com/Zizaco/entrust), you might change your `delete_threads` callback to return `Entrust::can('forum_threads_delete');`, allowing users with a role that grants the `forum_threads_delete` permission to delete threads.
+The default permission callbacks don't allow users to perform certain actions such as deleting threads or posts; you'll need to modify them to return true based on your own criteria. For example, if you use [Zizaco/entrust](https://github.com/Zizaco/entrust), you might change your `delete_threads` callback to return `Entrust::can('forum_threads_delete');`, allowing users with a role that grants the `forum_threads_delete` permission to delete threads.
 
 Note that the default set of views include links for deleting, editing and replying, and their visibility is controlled by the permission callbacks.
 

src/Riari/Forum/Commands/InstallCommand.php

@@ -27,7 +27,7 @@ public function fire()
     private function installController($name, $parent)
     {
         $file = $this->laravel->path.'/controllers/'.$name.'.php';
-        if(file_exists($file))
+        if (file_exists($file))
         {
             $this->info('File app/controllers/'.$name.' Exists. Action aborted.');
             return;

src/Riari/Forum/Controllers/BaseController.php

@@ -1,17 +1,16 @@
 <?php namespace Riari\Forum\Controllers;
 
+use App;
+use Config;
+use Controller;
+use Input;
+use Redirect;
 use Riari\Forum\Repositories\Categories;
 use Riari\Forum\Repositories\Threads;
 use Riari\Forum\Repositories\Posts;
 use Riari\Forum\Libraries\AccessControl;
 use Riari\Forum\Libraries\Alerts;
 use Riari\Forum\Libraries\Validation;
-
-use App;
-use Config;
-use Controller;
-use Input;
-use Redirect;
 use Route;
 use View;
 use Validator;
@@ -36,21 +35,14 @@ public function __construct(Categories $categories, Threads $threads, Posts $pos
     protected function getCurrentUser()
     {
         $current_user_callback = Config::get('forum::integration.current_user');
-
-        $user = $current_user_callback();
-        if (is_object($user) && get_class($user) == Config::get('forum::integration.user_model'))
-        {
-            return $user;
-        }
-
-        return NULL;
+        return $current_user_callback();
     }
 
     protected function check404()
     {
-        foreach($this->collections as $item)
+        foreach ($this->collections as $item)
         {
-            if($item == NULL)
+            if ($item == null)
             {
                 App::abort(404);
             }
@@ -89,13 +81,13 @@ protected function load($select = array(), $category_with = array())
 
         $route_name = Route::current()->getAction()['as'];
 
-        foreach($select as $model => $id)
+        foreach ($select as $model => $id)
         {
             $with = ($model == 'category') ? $category_with : array();
 
             $this->collections[$model] = $this->$map_model_repos[$model]->getByID($id, $with);
 
-            if(isset($map_route_permissions[$route_name]) && $model == $map_route_models[$route_name])
+            if (isset($map_route_permissions[$route_name]) && $model == $map_route_models[$route_name])
             {
                 AccessControl::check($this->collections[$model], $map_route_permissions[$route_name]);
             }
@@ -190,7 +182,7 @@ public function postReplyToThread($categoryID, $categoryAlias, $threadID, $threa
         $user = $this->getCurrentUser();
 
         $this->load(['category' => $categoryID, 'thread' => $threadID]);
-        
+
         if (!$this->collections['thread']->canReply)
         {
             return Redirect::to($this->collections['thread']->route);

src/Riari/Forum/ForumServiceProvider.php

@@ -1,10 +1,9 @@
 <?php namespace Riari\Forum;
 
+use Config;
 use Illuminate\Support\ServiceProvider;
 use Riari\Forum\Commands\InstallCommand;
 
-use Config;
-
 class ForumServiceProvider extends ServiceProvider {
 
     /**

src/Riari/Forum/Libraries/AccessControl.php

@@ -1,11 +1,11 @@
 <?php namespace Riari\Forum\Libraries;
 
-use Config;
 use App;
+use Config;
 
 class AccessControl {
 
-    public static function check($context, $permission, $abort = TRUE)
+    public static function check($context, $permission, $abort = true)
     {
         // Fetch the current user
         $user_callback = Config::get('forum::integration.current_user');

src/Riari/Forum/Libraries/Validation.php

@@ -1,16 +1,15 @@
 <?php namespace Riari\Forum\Libraries;
 
-use Riari\Forum\Libraries\Alerts;
-
 use Config;
 use Input;
+use Riari\Forum\Libraries\Alerts;
 use Validator;
 
 class Validation {
 
     public static function processValidationMessages($messages)
     {
-        foreach($messages as $message)
+        foreach ($messages as $message)
         {
             Alerts::add('danger', $message);
         }
@@ -21,16 +20,13 @@ public static function check($type = 'thread')
         $rules = Config::get('forum::preferences.validation_rules');
         $validator = Validator::make(Input::all(), $rules[$type]);
 
-        if ($validator->passes())
-        {
-            return TRUE;
-        }
-        else
+        if (!$validator->passes())
         {
             self::processValidationMessages($validator->messages()->all());
-
-            return FALSE;
+            return false;
         }
+
+        return false;
     }
 
 }

src/Riari/Forum/Models/Category.php

@@ -1,16 +1,15 @@
 <?php namespace Riari\Forum\Models;
 
+use Config;
 use Riari\Forum\Models\Thread;
 use Riari\Forum\Libraries\AccessControl;
-
-use Config;
 use Str;
 
 class Category extends BaseModel {
 
     protected $table      = 'forum_categories';
     public    $timestamps = false;
-    protected $appends    = ['threadCount', 'replyCount', 'Route', 'newThreadRoute'];
+    protected $appends    = ['threadCount', 'replyCount', 'route', 'newThreadRoute'];
 
     public function parentCategory()
     {
@@ -24,19 +23,29 @@ public function subcategories()
 
     public function threads()
     {
-        return $this->hasMany('\Riari\Forum\Models\Thread', 'parent_category')->with('category', 'posts')->orderBy('pinned', 'desc')->orderBy('updated_at', 'desc');
+        return $this->hasMany('\Riari\Forum\Models\Thread', 'parent_category')->with('category', 'posts');
     }
 
     public function getThreadsPaginatedAttribute()
     {
-        return $this->threads()->paginate(Config::get('forum::preferences.threads_per_category'));
+        return $this->threads()->orderBy('pinned', 'desc')->orderBy('updated_at', 'desc')->paginate(Config::get('forum::preferences.threads_per_category'));
     }
 
     public function getPageLinksAttribute()
     {
         return $this->threadsPaginated->links(Config::get('forum::preferences.pagination_view'));
     }
 
+    public function getNewestThreadAttribute()
+    {
+        return $this->threads()->orderBy('created_at', 'desc')->first();
+    }
+
+    public function getLatestActiveThreadAttribute()
+    {
+        return $this->threads()->orderBy('updated_at', 'desc')->first();
+    }
+
     public function getThreadCountAttribute()
     {
         return $this->rememberAttribute('threadCount', function(){
@@ -49,7 +58,7 @@ public function getReplyCountAttribute()
         return $this->rememberAttribute('replyCount', function(){
             $replyCount = 0;
 
-            $threads = $this->threads()->get(array('id'));
+            $threads = $this->threads()->get(['id']);
 
             foreach ($threads as $thread) {
                 $replyCount += $thread->posts->count();
@@ -81,12 +90,12 @@ public function getNewThreadRouteAttribute()
 
     public function getCanViewAttribute()
     {
-        return AccessControl::check($this, 'access_category', FALSE);
+        return AccessControl::check($this, 'access_category', false);
     }
 
     public function getCanPostAttribute()
     {
-        return AccessControl::check($this, 'create_threads', FALSE);
+        return AccessControl::check($this, 'create_threads', false);
     }
 
 }

src/Riari/Forum/Models/Post.php

@@ -1,9 +1,8 @@
 <?php namespace Riari\Forum\Models;
 
+use Config;
 use Illuminate\Database\Eloquent\SoftDeletingTrait;
 use Riari\Forum\Libraries\AccessControl;
-
-use Config;
 use Str;
 
 class Post extends BaseModel {
@@ -61,12 +60,12 @@ public function getDeleteRouteAttribute()
 
     public function getCanEditAttribute()
     {
-        return AccessControl::check($this, 'edit_post', FALSE);
+        return AccessControl::check($this, 'edit_post', false);
     }
 
     public function getCanDeleteAttribute()
     {
-        return AccessControl::check($this, 'delete_posts', FALSE);
+        return AccessControl::check($this, 'delete_posts', false);
     }
 
 }

src/Riari/Forum/Models/Thread.php

@@ -1,11 +1,10 @@
 <?php namespace Riari\Forum\Models;
 
+use Config;
 use Illuminate\Database\Eloquent\SoftDeletingTrait;
+use Redirect;
 use Riari\Forum\Libraries\AccessControl;
 use Riari\Forum\Libraries\Alerts;
-
-use Config;
-use Redirect;
 use Str;
 
 class Thread extends BaseModel {
@@ -102,22 +101,22 @@ public function getDeleteRouteAttribute()
 
     public function getCanReplyAttribute()
     {
-        return AccessControl::check($this, 'reply_to_thread', FALSE);
+        return AccessControl::check($this, 'reply_to_thread', false);
     }
 
     public function getCanPinAttribute()
     {
-        return AccessControl::check($this, 'pin_threads', FALSE);
+        return AccessControl::check($this, 'pin_threads', false);
     }
 
     public function getCanLockAttribute()
     {
-        return AccessControl::check($this, 'lock_threads', FALSE);
+        return AccessControl::check($this, 'lock_threads', false);
     }
 
     public function getCanDeleteAttribute()
     {
-        return AccessControl::check($this, 'delete_threads', FALSE);
+        return AccessControl::check($this, 'delete_threads', false);
     }
 
     public function toggle($property)

src/Riari/Forum/Repositories/BaseRepository.php

@@ -1,6 +1,5 @@
 <?php namespace Riari\Forum\Repositories;
 
-use stdClass;
 use Config;
 
 abstract class BaseRepository {