[Draft] Release 1.1.0

CHANGELOG.md

@@ -3,6 +3,10 @@
 ### Fixed
 - PHP 7.1 & 8.2 compatibility issue
 
+## [1.1.0-rc1] - 2024-02-16
+### Fixed
+- Concrete CMS version 9.x compatibility
+
 ## [1.0.1] - 2023-03-24
 
 - Fix php8 compatible issue due to core bug

blocks/c5j_rating_btn/view.php

@@ -7,6 +7,12 @@
 use Concrete\Core\Support\Facade\Facade;
 use Concrete\Core\Support\Facade\Url;
 use Concrete\Core\Page\Page;
+
+/** @var \Concrete\Core\View\View $view */
+
+$bID = $bID ?? 0;
+$displayRatings = $displayRatings ?? false;
+
 $app = Facade::getFacadeApplication();
 $btnType = $btnType ?? 'clap';
 $cID = Page::getCurrentPage()->getCollectionID();

blocks/c5j_rating_page_list/controller.php

@@ -143,6 +143,7 @@ public function on_start()
         $this->list = new PageList();
         $this->list->disableAutomaticSorting();
         $this->list->setNameSpace('b' . $this->bID);
+        $expr = $this->list->getQueryObject()->expr(); // Get Query Expression Object
 
         $cArray = [];
 
@@ -238,9 +239,16 @@ public function on_start()
         if ($this->displayAliases) {
             $this->list->includeAliases();
         }
+        if ($this->displaySystemPages) {
+            $this->list->includeSystemPages();
+        }
         if (isset($this->ignorePermissions) && $this->ignorePermissions) {
             $this->list->ignorePermissions();
         }
+        if ($this->excludeCurrentPage) {
+	    $ID = Page::getCurrentPage()->getCollectionID();
+	    $this->list->getQueryObject()->andWhere($expr->neq('p.cID', $ID));
+	}
 
         $this->list->filter('cvName', '', '!=');
 

blocks/c5j_rating_page_list/view.php

@@ -2,6 +2,10 @@
 defined('C5_EXECUTE') or die('Access Denied.');
 use Concrete\Core\Page\Page;
 
+/** @var \Concrete\Package\C5jRatings\Block\C5jRatingPageList\Controller $controller */
+/** @var \Concrete\Core\View\View $view */
+
+$bID = $bID ?? 0;
 $c = Page::getCurrentPage();
 $app = \Concrete\Core\Support\Facade\Application::getFacadeApplication();
 /** @var \Concrete\Core\Utility\Service\Text $th */
@@ -10,6 +14,22 @@
 $dh = $app->make('helper/date');
 $pages = $pages ?? [];
 $showPagination = $showPagination ?? [];
+$pagination = $pagination ?? '';
+$noResultsMessage = $noResultsMessage ?? '';
+$titleFormat = $titleFormat ?? 'h3';
+$displayThumbnail = $displayThumbnail ?? false;
+$truncateSummaries = $truncateSummaries ?? false;
+$truncateChars = $truncateChars ?? 300;
+$includeName = $includeName ?? true;
+$includeDate = $includeDate ?? true;
+$includeDescription = $includeDescription ?? true;
+$useButtonForLink = $useButtonForLink ?? false;
+$buttonLinkText = $buttonLinkText ?? t('Read More');
+$includeEntryText = false;
+$btnType = $btnType ?? 'clap';
+$displayRatings = $displayRatings ?? false;
+$ratings = $ratings ?? [];
+
 
 if (is_object($c) && $c->isEditMode() && $controller->isBlockEmpty()) {
     ?>
@@ -205,16 +225,22 @@ class="<?php echo h($buttonClasses) ?>"><?php echo h($buttonLinkText) ?></a>
     } ?>
 <script>
     $(document).ready(function () {
-        let getUrl = "<?= URL::to($view->action('get_ratings')) ?>";
-        let params = {
-            token: "<?= $app->make('token')->generate('rating') ?>",
-            uID: getUserID(),
-        };
-
-        $('input[name^="pageIDs"]').each(function() {
-            params['cID'] = this.value;
-            getRatings(getUrl, params);
-        });
+        function setRate() {
+            const cIDs = [];
+            $('input[name^="pageIDs"]').each( function() {
+                cIDs.push(this.value);
+            });
+            if (cIDs.length > 0) {
+                const url = "<?= URL::to($view->action('get_ratings')) ?>";
+                const params = {
+                    token: "<?= $app->make('token')->generate('rating') ?>",
+                    uID: getUserID(),
+                    cID: cIDs
+                };
+                updateRatings(url, params);
+            }
+        }
+        setRate();
     });
 
     function getUserID() {

controller.php

@@ -31,7 +31,7 @@ class Controller extends Package
     /**
      * @var string package version
      */
-    protected $pkgVersion = '1.0.2';
+    protected $pkgVersion = '1.1.0-rc1';
 
     protected $pkgAutoloaderRegistries = [
         'src' => '\C5jRatings',

js/c5j_ratings.js

@@ -8,6 +8,12 @@ function updateRatings(url, params) {
         type: 'post',
         data: params,
         success: function(data) {
+            if (Array.isArray(params['cID'])) {
+                data.forEach(function (item) {
+                    updateRatingButtons(item);
+                });
+                return;
+            }
             updateRatingButtons(data);
         }
     });

single_pages/dashboard/ratings/view.php

@@ -2,6 +2,7 @@
 defined('C5_EXECUTE') or die('Access Denied.');
 use Concrete\Core\User\UserInfoRepository;
 
+/** @var \Concrete\Core\View\View $view */
 $app = \Concrete\Core\Support\Facade\Application::getFacadeApplication();
 /* @var Concrete\Core\Form\Service\Form $form */
 $form = $app->make('helper/form');
@@ -11,6 +12,7 @@
 $dh = $app->make('helper/date');
 /** @var string $rated_date */
 $rated_date = $rated_date ?? null;
+$query = $query ?? '';
 ?>
 <style>
     .ratings-header-menu{
@@ -19,16 +21,16 @@
         /*right: 35px;*/
     }
     div#ccm-dashboard-content-inner{
-        padding-top: 0px !important;
+        padding-top: 0 !important;
     }
     .ccm-header-search-form-input{
         display: inline-block;
     }
     ul.ccm-header-search-navigation {
         list-style: none;
         text-align: right;
-        padding: 4px 0px 0px 0px;
-        margin:0px 0px 0px 0px
+        padding: 4px 0 0 0;
+        margin:0 0 0 0
     }
 </style>
 <?php

src/Traits/RatingTrait.php

@@ -21,7 +21,7 @@ public function action_rate(int $bID)
     {
         $this->token = $this->app->make('helper/validation/token');
         $uID = (int) $this->post('uID');
-        if ($this->validate('rating', $this->post('token'), $uID)) {
+        if ($this->validateToken('rating', $this->post('token'), $uID)) {
             $cID = (int) $this->post('cID');
             $ratedValue = $this->post('ratedValue');
             $this->addRating($uID, $cID, $bID, $ratedValue);
@@ -36,13 +36,20 @@ public function action_get_ratings(int $bID)
     {
         $this->token = $this->app->make('helper/validation/token');
         $uID = (int) $this->post('uID');
-        if ($this->validate('rating', $this->post('token'), $uID)) {
-            $cID = (int) $this->post('cID');
+        if ($this->validateToken('rating', $this->post('token'), $uID)) {
+            $ratings = [];
+            $cID = $this->post('cID');
+            if (is_array($cID)) {
+                foreach ($cID as $id) {
+                    $ratings[] = $this->getRatings((int)$id, $uID);
+                }
+            } else {
+                $ratings = $this->getRatings((int)$cID, $uID);
+            }
 
-            return JsonResponse::create($this->getRatings($cID, $uID));
+            return JsonResponse::create($ratings);
         }
-
-            return JsonResponse::create($this->token->getErrorMessage());
+        return JsonResponse::create($this->token->getErrorMessage());
     }
 
     public function generate($action = '', $time = null, $uID = 0): string
@@ -64,7 +71,7 @@ public function generate($action = '', $time = null, $uID = 0): string
         return $time . ':' . md5($time . ':' . $uID . ':' . $action . ':' . $config->get('concrete.security.token.validation'));
     }
 
-    public function validate($action = '', $token = null, $uID = 0): bool
+    public function validateToken($action = '', $token = null, $uID = 0): bool
     {
         $app = Application::getFacadeApplication();
         if ($token === null) {