Bugfixes and Bootstrap 5 finalized

app/plugins/comments/controllers/admin/comments.php

@@ -49,9 +49,13 @@ class Comments extends AdminController {
         $this->index();
     }
 
-    public function viewComment( $data = null ) {
-        $commentData = self::$comments->findById( $data );
-        if ( $commentData !== false ) {
+    public function viewComments( $contentIID = null ) {
+        if ( empty( $contentIID ) ) {
+            Issues::add( 'error', 'Content ID not found.' );
+            return $this->index();
+        }
+        $contentData = self::$comments->findById( $data );
+        if ( empty( $contentIID ) ) {
             return Views::view( 'comments.list', $commentData );
         }
         Issues::add( 'error', 'Comment not found.' );

app/plugins/comments/plugin.php

@@ -25,9 +25,10 @@ use TheTempusProject\Houdini\Classes\Views;
 use TheTempusProject\Classes\Forms;
 use TheTempusProject\Hermes\Functions\Redirect;
 use TheTempusProject\Bedrock\Functions\Session;
-use TheTempusProject\Models\Comments as CommentModel;
+use TheTempusProject\Models\Comments as CommentsModel;
 
 class Comments extends Plugin {
+    protected static $comments;
     public $pluginName = 'TP Comments';
     public $pluginAuthor = 'JoeyK';
     public $pluginWebsite = 'https://TheTempusProject.com';
@@ -61,7 +62,6 @@ class Comments extends Plugin {
             ]
         ],
     ];
-    public $comments;
 
     public function __construct( $load = false ) {
         if ( !empty(App::$activePerms) ) {
@@ -75,11 +75,16 @@ class Comments extends Plugin {
             'replace' => ( App::$isMod ? '$1' : '' ),
             'enabled' => true,
         ];
-        $this->getModel();
+        self::$comments = new CommentsModel;
         parent::__construct( $load );
     }
 
     public function formPost( $type, $content, $redirect ) {
+        if ( ! $this->checkEnabled() ) {
+            Debug::info( 'Comments Plugin is disabled in the control panel.' );
+            Issues::add( 'error', 'Comments are disabled.' );
+            return false;
+        }
         if ( !App::$isLoggedIn ) {
             Session::flash( 'notice', 'You must be logged in to post comments.' );
             return Redirect::to( $redirect . $content->ID );
@@ -88,7 +93,7 @@ class Comments extends Plugin {
             Session::flash( 'error', [ 'There was a problem with your comment form.' => Check::userErrors() ] );
             return Redirect::to( $redirect . $content->ID );
         }
-        if ( !$this->comments->create( $type, $content->ID, Input::post( 'comment' ) ) ) {
+        if ( !self::$comments->create( $type, $content->ID, Input::post( 'comment' ) ) ) {
             Session::flash( 'error', [ 'There was a problem posting your comment.' => Check::userErrors() ] );
         } else {
             Session::flash( 'success', 'Comment posted' );
@@ -97,6 +102,11 @@ class Comments extends Plugin {
     }
 
     public function formEdit( $type, $content, $redirect ) {
+        if ( ! $this->checkEnabled() ) {
+            Debug::info( 'Comments Plugin is disabled in the control panel.' );
+            Issues::add( 'error', 'Comments are disabled.' );
+            return false;
+        }
         if ( !App::$isLoggedIn ) {
             Session::flash( 'notice', 'You must be logged in to do that.' );
             return Redirect::to( $type );
@@ -112,7 +122,7 @@ class Comments extends Plugin {
             Issues::add( 'error', [ 'There was a problem editing your comment.' => Check::userErrors() ] );
             return Views::view( 'comments.admin.edit', $content );
         }
-        if ( !$this->comments->update( $content->ID, Input::post( 'comment' ) ) ) {
+        if ( !self::$comments->update( $content->ID, Input::post( 'comment' ) ) ) {
             Issues::add( 'error', [ 'There was a problem editing your comment.' => Check::userErrors() ] );
             return Views::view( 'comments.admin.edit', $content );
         }
@@ -121,6 +131,11 @@ class Comments extends Plugin {
     }
 
     public function formDelete( $type, $content, $redirect ) {
+        if ( ! $this->checkEnabled() ) {
+            Debug::info( 'Comments Plugin is disabled in the control panel.' );
+            Issues::add( 'error', 'Comments are disabled.' );
+            return false;
+        }
         if ( !App::$isLoggedIn ) {
             Session::flash( 'notice', 'You must be logged in to do that.' );
             return Redirect::to( $type );
@@ -129,18 +144,11 @@ class Comments extends Plugin {
             Session::flash( 'error', 'You do not have permission to edit this comment' );
             return Redirect::to( $type );
         }
-        if ( !$this->comments->delete( (array) $content->ID ) ) {
+        if ( !self::$comments->delete( (array) $content->ID ) ) {
             Session::flash( 'error', 'There was an error with your request.' );
         } else {
             Session::flash( 'success', 'Comment has been deleted' );
         }
         return Redirect::to( $redirect . $content->contentID );
     }
-
-    public function getModel() {
-        if ( empty($this->comments) ) {
-            $this->comments = new CommentModel;
-        }
-        return $this->comments;
-    }
 }

app/plugins/comments/views/admin/edit.html

@@ -1,9 +1,25 @@
-<form action="" method="post" class="form-horizontal">
-    <div class="form-group center-block">
-        <div class="col-lg-4 col-lg-offset-4">
-            <textarea class="form-control" name="comment" maxlength="2000" rows="10" cols="50" id="comment">{content}</textarea>
-        </div>
+<div class="mb-4 mt-4">
+    <div class="offset-md-1 col-10 p-3 context-main-bg">
+        <legend class="text-center">Edit Comment</legend>
+        <hr>
+        {ADMIN_BREADCRUMBS}
+        <form action="" method="post" class="container py-4">
+            <fieldset>
+                <div class="mb-3 row">
+                    <label for="comment" class="col-lg-5 col-form-label text-end">Comment:</label>
+                    <div class="col-lg-3">
+                        <textarea class="form-control" name="comment" maxlength="2000" rows="5" cols="50" id="comment">{content}</textarea>
+                    </div>
+                </div>
+
+                <!-- Hidden Token -->
+                <input type="hidden" name="token" value="{TOKEN}">
+
+                <!-- Submit Button -->
+                <div class="text-center">
+                    <button type="submit" name="submit" value="submit" class="btn btn-primary btn-lg">Save</button>
+                </div>
+            </fieldset>
+        </form>
     </div>
-    <button name="submit" value="submit" type="submit" class="btn btn-lg btn-primary center-block">Comment</button>
-    <input type="hidden" name="token" value="{TOKEN}">
-</form>
+</div>

app/plugins/comments/views/admin/list.html

@@ -1,43 +1,45 @@
-<legend>Recent Comments</legend>
-{PAGINATION}
-<form action="{ROOT_URL}admin/comments/delete" method="post">
-    <table class="table table-striped">
-        <thead>
-            <tr>
-                <th style="width: 20%">Author</th>
-                <th style="width: 20%">Subject</th>
-                <th style="width: 35%">Comment</th>
-                <th style="width: 10%">Time</th>
-                <th style="width: 5%"></th>
-                <th style="width: 5%"></th>
-                <th style="width: 5%">
-                    <INPUT type="checkbox" onchange="checkAll(this)" name="check.c" value="C_[]"/>
-                </th>
-            </tr>
-        </thead>
-        <tbody>
-            {LOOP}
-            <tr>
-                <td><a href="{ROOT_URL}admin/users/view/{author}">{authorName}</a></td>
-                <td><a href="{ROOT_URL}admin/blog/view/{contentID}">{contentTitle}</a></td>
-                <td>{content}</td>
-                <td>{DTC}{created}{/DTC}</td> 
-                <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil"></i></a></td>
-                <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
-                <td>
-                    <input type="checkbox" value="{ID}" name="C_[]">
-                </td>
-            </tr>
-            {/LOOP}
-            {ALT}
-            <tr>
-                <td align="center" colspan="7">
-                    No results to show.
-                </td>
-            </tr>
-            {/ALT}
-        </tbody>
-    </table>
-    <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger">Delete</button>
-</form>
-<br />
+<div class="context-main-bg context-main p-3">
+    <legend class="text-center">Recent Comments</legend>
+    <hr>
+    {ADMIN_BREADCRUMBS}
+    <form action="{ROOT_URL}admin/comments/delete" method="post">
+        <table class="table table-striped">
+            <thead>
+                <tr>
+                    <th style="width: 20%">Author</th>
+                    <th style="width: 20%">Subject</th>
+                    <th style="width: 35%">Comment</th>
+                    <th style="width: 10%">Time</th>
+                    <th style="width: 5%"></th>
+                    <th style="width: 5%"></th>
+                    <th style="width: 5%">
+                        <INPUT type="checkbox" onchange="checkAll(this)" name="check.c" value="C_[]"/>
+                    </th>
+                </tr>
+            </thead>
+            <tbody>
+                {LOOP}
+                <tr>
+                    <td><a href="{ROOT_URL}admin/users/view/{author}">{authorName}</a></td>
+                    <td><a href="{ROOT_URL}admin/blog/view/{contentID}">{contentTitle}</a></td>
+                    <td>{content}</td>
+                    <td>{DTC}{created}{/DTC}</td> 
+                    <td><a href="{ROOT_URL}admin/comments/edit/{ID}" class="btn btn-sm btn-warning"><i class="fa fa-fw fa-pencil"></i></a></td>
+                    <td><a href="{ROOT_URL}admin/comments/delete/{ID}" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></a></td>
+                    <td>
+                        <input type="checkbox" value="{ID}" name="C_[]">
+                    </td>
+                </tr>
+                {/LOOP}
+                {ALT}
+                <tr>
+                    <td align="center" colspan="7">
+                        No results to show.
+                    </td>
+                </tr>
+                {/ALT}
+            </tbody>
+        </table>
+        <button name="submit" value="submit" type="submit" class="btn btn-sm btn-danger"><i class="fa fa-fw fa-trash"></i></button>
+    </form>
+</div>

app/plugins/comments/views/list.html

@@ -1,14 +1,14 @@
 <div class="card">
-    <div class="card-header bg-secondary text-white d-flex align-items-center justify-content-between">
+    <div class="card-header d-flex align-items-center justify-content-between context-second-bg context-main">
         <h3 class="card-title mb-0">
             <i class="fa fa-fw fa-comment"></i> Comments
         </h3>
         <span class="badge bg-primary">{count}</span>
     </div>
-    <div class="card-body bg-light">
+    <div class="card-body context-main-bg context-main">
         <ul class="list-group list-group-flush">
             {LOOP}
-            <li class="list-group-item">
+            <li class="list-group-item context-second-bg context-main mb-2">
                 <div class="d-flex align-items-start">
                     <div class="me-3">
                         <img src="{ROOT_URL}{avatar}" class="rounded-circle" alt="User Avatar" style="width: 50px; height: 50px;">