From 2a62d937b335b34eda2335603d027dfb53fbeeae Mon Sep 17 00:00:00 2001
From: Md Biplob Hossain <biplob.ice@gmail.com>
Date: Fri, 16 Feb 2024 15:26:52 +0900
Subject: [PATCH 1/7] Fix validate method conflict

---
 src/Traits/RatingTrait.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Traits/RatingTrait.php b/src/Traits/RatingTrait.php
index 5311e74..c414fe2 100644
--- a/src/Traits/RatingTrait.php
+++ b/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,7 +36,7 @@ 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)) {
+        if ($this->validateToken('rating', $this->post('token'), $uID)) {
             $cID = (int) $this->post('cID');
 
             return JsonResponse::create($this->getRatings($cID, $uID));
@@ -64,7 +64,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) {

From 5b78eec20f8e7c3705381fcdb7fd18413bac12b7 Mon Sep 17 00:00:00 2001
From: Md Biplob Hossain <biplob.ice@gmail.com>
Date: Fri, 16 Feb 2024 17:20:45 +0900
Subject: [PATCH 2/7] Adopt changes from core page list block

---
 blocks/c5j_rating_page_list/controller.php    |   8 +
 .../c5j_rating_page_list/page_list_form.php   | 459 ++++++++++--------
 2 files changed, 256 insertions(+), 211 deletions(-)

diff --git a/blocks/c5j_rating_page_list/controller.php b/blocks/c5j_rating_page_list/controller.php
index 1fc6790..0bd18af 100644
--- a/blocks/c5j_rating_page_list/controller.php
+++ b/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', '', '!=');
 
diff --git a/blocks/c5j_rating_page_list/page_list_form.php b/blocks/c5j_rating_page_list/page_list_form.php
index a9af7e0..dd5f0d7 100644
--- a/blocks/c5j_rating_page_list/page_list_form.php
+++ b/blocks/c5j_rating_page_list/page_list_form.php
@@ -1,10 +1,13 @@
 <?php
 defined('C5_EXECUTE') or die('Access Denied.');
+
 use Concrete\Package\C5jRatings\Block\C5jRatingPageList\Controller;
+use Concrete\Core\Application\Service\Urls;
 use Concrete\Core\Application\Service\UserInterface;
 use Concrete\Core\Attribute\Key\CollectionKey;
 use Concrete\Core\Block\BlockType\BlockType;
 use Concrete\Core\Entity\Attribute\Category;
+use Concrete\Core\Entity\Attribute\Key\Key;
 use Concrete\Core\Form\Service\Form;
 use Concrete\Core\Form\Service\Widget\PageSelector;
 use Concrete\Core\Entity\Page\Feed;
@@ -33,6 +36,7 @@
     $miniNumOfRatings = $miniNumOfRatings ?? 0;
 /** @var int $numOfRatings */
     $numOfRatings = $numOfRatings ?? 0;
+/** @var string $topicFilter */
 /** @var string $filterDateOption */
 /** @var int $filterDateDays */
 /** @var string $filterDateStart */
@@ -45,15 +49,21 @@
 /** @var bool $includeDescription */
 /** @var bool $includeAllDescendents */
 /** @var bool $paginate */
+/** @var bool $displaySystemPages */
+$displaySystemPages = $displaySystemPages ?? false;
+/** @var bool $excludeCurrentPages */
+$excludeCurrentPage = $excludeCurrentPage ?? false;
 /** @var bool $displayAliases */
 /** @var bool $ignorePermissions */
 /** @var bool $enableExternalFiltering */
 /** @var int $ptID */
+/** @var int $pfID */
 /** @var int $truncateSummaries */
 /** @var bool $displayFeaturedOnly */
 /** @var string $noResultsMessage */
 /** @var bool $displayThumbnail */
 /** @var int $truncateChars */
+/** @var Urls $uh */
 /** @var BlockType $bt */
 /** @var CollectionKey $featuredAttribute */
 /** @var Category[] $attributeKeys */
@@ -62,6 +72,8 @@
 /** @var Feed $rssFeed */
 /** @var string $btnType */
 $btnType = $btnType ?? 'Heart';
+$cmsVersion = app('config')->get('concrete.version');
+$isV9 = version_compare($cmsVersion, '9.0.0', '>=');
 
 if (!isset($filterDateDays)) {
     $filterDateDays = false;
@@ -105,6 +117,8 @@
 $pageSelector = $app->make(PageSelector::class);
 /** @var UserInterface $userInterface */
 $userInterface = $app->make(UserInterface::class);
+/** @var Urls $urlService */
+$urlService = $app->make(Urls::class);
 /** @var Form $form */
 $form = $app->make(Form::class);
 /** @var DateTime $dateTime */
@@ -119,23 +133,24 @@
 <div class="ccm-tab-content tab-content" id="ccm-tab-content-page-list-settings">
     <div class="tab-pane active pagelist-form" id="page-list-settings" role="tabpanel">
         <input type="hidden" name="pageListPreviewPane" value="<?= h($controller->getActionURL('preview_pane')) ?>"/>
+
         <fieldset>
             <div class="form-group">
                 <?php echo $form->label('num', t('Number of Pages to Display')); ?>
-                <?php echo $form->number("num", $num); ?>
+                <?php echo $form->number("num", $num, ['min' => 0]); ?>
             </div>
 
             <div class="form-group">
                 <?php
-                    $pageTypes = ['0' => t('** All')];
-                    /** @noinspection PhpUndefinedClassInspection */
-                    foreach (PageType::getList(false, $siteType) as $pageType) {
-                        /** @var Type $pageType */
-                        $pageTypes[$pageType->getPageTypeID()] = $pageType->getPageTypeDisplayName();
-                    }
+                $pageTypes = ['0' => t('** All')];
+                /** @noinspection PhpUndefinedClassInspection */
+                foreach (PageType::getList(false, $siteType) as $pageType) {
+                    /** @var Type $pageType */
+                    $pageTypes[$pageType->getPageTypeID()] = $pageType->getPageTypeDisplayName();
+                }
 
-                    echo $form->label('ptID', t('Page Type'));
-                    echo $form->select("ptID", $pageTypes, $ptID);
+                echo $form->label('ptID', t('Page Type'));
+                echo $form->select("ptID", $pageTypes, $ptID);
                 ?>
             </div>
         </fieldset>
@@ -143,14 +158,17 @@
         <fieldset>
             <div class="form-group">
                 <?php echo $form->label('', t('Topics')); ?>
+
                 <div class="form-check">
                     <?php echo $form->radio("topicFilter", "", $topicFilter, ["id" => "topicFilter", "name" => "topicFilter"]); ?>
                     <?php echo $form->label("topicFilter", t("No topic filtering"), ["class" => "form-check-label"]); ?>
                 </div>
+
                 <div class="form-check">
                     <?php echo $form->radio("topicFilter", "custom", $topicFilter, ["id" => "topicFilterCustom", "name" => "topicFilter"]); ?>
                     <?php echo $form->label("topicFilterCustom", t("Custom Topic"), ["class" => "form-check-label"]); ?>
                 </div>
+
                 <div class="form-check">
                     <?php echo $form->radio("topicFilter", "related", $topicFilter, ["id" => "topicFilterRelated", "name" => "topicFilter"]); ?>
                     <?php echo $form->label("topicFilterRelated", t("Related Topic"), ["class" => "form-check-label"]); ?>
@@ -181,25 +199,26 @@
                         <?=t('Allows other blocks like the topic list block to pass search criteria to this page list block.')?>
                     </span>
                     <?php
-                        $relatedTopicAttributeKeyHandles = [
-                                "" => t('Choose topics attribute.')
-                        ];
+                    $relatedTopicAttributeKeyHandles = [
+                        "" => t('Choose topics attribute.')
+                    ];
 
-                        foreach ($attributeKeys as $attributeKey) {
-                            $relatedTopicAttributeKeyHandles[$attributeKey->getAttributeKeyHandle()] = $attributeKey->getAttributeKeyDisplayName();
-                        }
+                    foreach ($attributeKeys as $attributeKey) {
+                        $relatedTopicAttributeKeyHandles[$attributeKey->getAttributeKeyHandle()] = $attributeKey->getAttributeKeyDisplayName();
+                    }
 
-                        echo $form->select("relatedTopicAttributeKeyHandle", $relatedTopicAttributeKeyHandles, $relatedTopicAttributeKeyHandle);
+                    echo $form->select("relatedTopicAttributeKeyHandle", $relatedTopicAttributeKeyHandles, $relatedTopicAttributeKeyHandle);
                     ?>
-                    
                 </div>
             </div>
-
         </fieldset>
 
         <fieldset>
             <div class="form-group">
-                <label class="control-label"><?= t('Filter by Public Date') ?></label>
+                <label class="control-label form-label">
+                    <?php echo t('Filter by Public Date') ?>
+                </label>
+
                 <?php
                 $filterDateOptions = [
                     'all' => t('Show All'),
@@ -209,37 +228,49 @@
                     'between' => t('Between'),
                 ];
                 $i = 0;
+                ?>
+
+                <?php foreach ($filterDateOptions as $filterDateOptionHandle => $filterDateOptionLabel) { ?>
 
-                foreach ($filterDateOptions as $filterDateOptionHandle => $filterDateOptionLabel) {
-                    $isChecked = ($filterDateOption == $filterDateOptionHandle) ? 'checked' : ''; ?>
                     <div class="form-check">
                         <?php $id = "filterDateOption" . $i++; ?>
                         <?php echo $form->radio("filterDateOption", $filterDateOptionHandle, $filterDateOption, ["id" => $id, "name" => "filterDateOption", "class" => "form-check-input filterDateOption"]); ?>
                         <?php echo $form->label($id, $filterDateOptionLabel, ["class" => "form-check-label"]); ?>
                     </div>
-                    <?php
-                } ?>
+                <?php } ?>
 
                 <div class="filterDateOptionDetail" data-filterDateOption="past">
                     <div class="form-group">
-                        <label class="control-label"><?=t('Days in the Past')?> <i class="launch-tooltip fa fa-question-circle" title="<?=t('Leave 0 to show all past dated pages')?>"></i></label>
+                        <label class="control-label form-label">
+                            <?php echo t('Days in the Past') ?>
+                            <i class="launch-tooltip fas fa-question-circle"
+                               title="<?php echo t('Leave 0 to show all past dated pages') ?>"></i>
+                        </label>
+
                         <?php echo $form->text("filterDatePast", $filterDateDays ? $filterDateDays : 0); ?>
                     </div>
                 </div>
 
                 <div class="filterDateOptionDetail" data-filterDateOption="future">
                     <div class="form-group">
-                        <label class="control-label"><?=t('Days in the Future')?> <i class="launch-tooltip fa fa-question-circle" title="<?=t('Leave 0 to show all future dated pages')?>"></i></label>
+                        <label class="control-label form-label">
+                            <?php echo t('Days in the Future') ?>
+                            <i class="launch-tooltip fas fa-question-circle"
+                               title="<?php echo t('Leave 0 to show all future dated pages') ?>"></i>
+                        </label>
+
                         <?php echo $form->text("filterDateFuture", $filterDateDays ? $filterDateDays : 0); ?>
                     </div>
                 </div>
 
                 <div class="filterDateOptionDetail" data-filterDateOption="between">
-                    <?php
-                    echo $dateTime->date('filterDateStart', $filterDateStart);
-                    echo '<p>' . t('and') . '</p>';
-                    echo $dateTime->date('filterDateEnd', $filterDateEnd);
-                    ?>
+                    <?php echo $dateTime->date('filterDateStart', $filterDateStart); ?>
+
+                    <p>
+                        <?php echo t('and'); ?>
+                    </p>
+
+                    <?php echo $dateTime->date('filterDateEnd', $filterDateEnd); ?>
                 </div>
 
             </div>
@@ -256,9 +287,7 @@
                 </div>
                 
                 <?php
-                    $config = $app->make('config');
-                    $codeVersion = $config->get('concrete.version');
-                    if (version_compare($codeVersion, '9.0.0', '<')) {
+                if ($isV9) {
                         ?>
                         <div class="ccm-page-list-number-ratings">
                             <div class="input-group">
@@ -332,24 +361,39 @@
                     <?php if (!is_object($featuredAttribute)) { ?>
                         <div class="help-block">
                             <?php echo t(
-                                    '(<strong>Note</strong>: You must create the "is_featured" page attribute first.)');
+                                '(<strong>Note</strong>: You must create the "is_featured" page attribute first.)');
                             ?>
                         </div>
                     <?php } ?>
                 </div>
+
                 <div class="form-check">
                     <?php echo $form->checkbox("displayAliases", "1", $displayAliases); ?>
                     <?php echo $form->label("displayAliases", t("Display page aliases."), ["class" => "form-check-label"]); ?>
                 </div>
+
+                <div class="form-check">
+                    <?php echo $form->checkbox("displaySystemPages", "1", $displaySystemPages); ?>
+                    <?php echo $form->label("displaySystemPages", t("Display system pages."), ["class" => "form-check-label"]); ?>
+                </div>
+
                 <div class="form-check">
                     <?php echo $form->checkbox("ignorePermissions", "1", $ignorePermissions); ?>
                     <?php echo $form->label("ignorePermissions", t("Ignore page permissions."), ["class" => "form-check-label"]); ?>
                 </div>
+
                 <div class="form-check">
                     <?php echo $form->checkbox("enableExternalFiltering", "1", $enableExternalFiltering); ?>
                     <?php echo $form->label("enableExternalFiltering", t("Enable Other Blocks to Filter This Page List."), ["class" => "form-check-label"]); ?>
+                    <i class="launch-tooltip fa fa-question-circle" title="<?php echo t('Allow other blocks, like the topic list block, to pass search criteria to this page list block.') ?>"></i>
                 </div>
 
+		<div class="form-check">
+                    <?php echo $form->checkbox("excludeCurrentPage", "1", $excludeCurrentPage); ?>
+                    <?php echo $form->label("excludeCurrentPage", t("Exclude Current Page"), ["class" => "form-check-label"]); ?>
+		    <i class="launch-tooltip fa fa-question-circle" title="<?php echo t('If the currently rendered page is in the list, exclude it.') ?>"></i>
+                </div>
+            </div>
         </fieldset>
 
         <fieldset>
@@ -362,6 +406,7 @@
                 </div>
             </div>
         </fieldset>
+
         <fieldset>
             <div class="form-group">
                 <?php echo $form->label('', t('Location')); ?>
@@ -403,233 +448,222 @@
                 </div>
             </div>
         </fieldset>
+
         <fieldset>
             <div class="form-group">
                 <?php
-                    echo $form->label("orderBy", t('Sort'));
-                    echo $form->select("orderBy", [
-                            "display_asc" => t('Sitemap order'),
-                            "display_desc" => t('Reverse sitemap order'),
-                            "chrono_desc" => t('Most recent first'),
-                            "chrono_asc" => t('Earliest first'),
-                            "alpha_asc" => t('Alphabetical order'),
-                            "alpha_desc" => t('Reverse alphabetical order'),
-                            "modified_desc" => t('Most recently modified first'),
-                            "rated_desc" => t('Most rated first'),
-                            "recently_rated_desc" => t('Most recently rated first'),
-                            "random" => t('Random')
-                    ], $orderBy);
+                echo $form->label("orderBy", t('Sort'));
+                echo $form->select("orderBy", [
+                    "display_asc" => t('Sitemap order'),
+                    "display_desc" => t('Reverse sitemap order'),
+                    "chrono_desc" => t('Most recent first'),
+                    "chrono_asc" => t('Earliest first'),
+                    "alpha_asc" => t('Alphabetical order'),
+                    "alpha_desc" => t('Reverse alphabetical order'),
+                    "modified_desc" => t('Most recently modified first'),
+                    "rated_desc" => t('Most rated first'),
+                    "recently_rated_desc" => t('Most recently rated first'),
+                    "random" => t('Random')
+                ], $orderBy);
                 ?>
             </div>
         </fieldset>
 
+        <fieldset>
+            <legend>
+                <?php echo t('Output') ?>
+            </legend>
 
-    <fieldset>
-        <legend>
-            <?php echo t('Output') ?>
-        </legend>
-
-        <div class="form-group">
-            <?php
-                echo $form->label("btnType", t('Button Type'));
-                echo $form->select("btnType", [
-                        "clap" => t('Clap'),
-                        "heart" => t('Heart'),
-                        "like" => t('Like')
-                ], $btnType);
-            ?>
-        </div>
-        <div class="form-group">
-            <label class="control-label form-label"><?=t('Display the total rating?')?></label>
-            <div class="radio">
-                <label>
-                    <input type="radio" id="displayRatings1" name="displayRatings" value="1" class="ccm-input-radio" checked="checked">
-                    <?=t('Yes')?>
-                </label>
+            <div class="form-group">
+                <?php
+                    echo $form->label("btnType", t('Button Type'));
+                    echo $form->select("btnType", [
+                            "clap" => t('Clap'),
+                            "heart" => t('Heart'),
+                            "like" => t('Like')
+                    ], $btnType);
+                ?>
             </div>
-            <div class="radio">
-                <label>
-                    <input type="radio" id="displayRatings2" name="displayRatings" value="0" class="ccm-input-radio">
-                    <?=t('No')?>
-                </label>
+            <div class="form-group">
+                <label class="control-label form-label"><?=t('Display the total rating?')?></label>
+                <div class="radio">
+                    <label>
+                        <input type="radio" id="displayRatings1" name="displayRatings" value="1" class="ccm-input-radio" checked="checked">
+                        <?=t('Yes')?>
+                    </label>
+                </div>
+                <div class="radio">
+                    <label>
+                        <input type="radio" id="displayRatings2" name="displayRatings" value="0" class="ccm-input-radio">
+                        <?=t('No')?>
+                    </label>
+                </div>
             </div>
-        </div>
 
-        <div class="form-group">
-            <label class="control-label form-label">
-                <?php echo t('Provide RSS Feed') ?>
-            </label>
+            <div class="form-group">
+                <label class="control-label form-label">
+                    <?php echo t('Provide RSS Feed') ?>
+                </label>
 
-            <div class="form-check">
-                <?php echo $form->radio("rss", "0", is_object($rssFeed) ? '1' : '0', ["id" => "disableRssFeed", "name" => "rss", "class" => "form-check-input rssSelector"]); ?>
-                <?php echo $form->label("disableRssFeed", t("No"), ["class" => "form-check-label"]); ?>
-            </div>
+                <div class="form-check">
+                    <?php echo $form->radio("rss", "0", is_object($rssFeed) ? '1' : '0', ["id" => "disableRssFeed", "name" => "rss", "class" => "form-check-input rssSelector"]); ?>
+                    <?php echo $form->label("disableRssFeed", t("No"), ["class" => "form-check-label"]); ?>
+                </div>
 
-            <div class="form-check">
-                <?php echo $form->radio("rss", "1", is_object($rssFeed) ? '1' : '0', ["id" => "enableRssFeed", "name" => "rss", "class" => "form-check-input rssSelector"]); ?>
-                <?php echo $form->label("enableRssFeed", t("Yes"), ["class" => "form-check-label"]); ?>
-            </div>
+                <div class="form-check">
+                    <?php echo $form->radio("rss", "1", is_object($rssFeed) ? '1' : '0', ["id" => "enableRssFeed", "name" => "rss", "class" => "form-check-input rssSelector"]); ?>
+                    <?php echo $form->label("enableRssFeed", t("Yes"), ["class" => "form-check-label"]); ?>
+                </div>
 
-            <div id="ccm-pagelist-rssDetails" <?php echo(is_object($rssFeed) ? '' : 'style="display:none;"') ?>>
-                <?php if (is_object($rssFeed)) { ?>
-                    <?php echo t('RSS Feed can be found here: %s', '<a href="' . h($rssFeed->getFeedURL()) . '" target="_blank">' . $rssFeed->getFeedURL() . '</a>') ?>
-                <?php } else { ?>
-                    <div class="form-group">
-                        <?php echo $form->label('num', t('RSS Feed Title')); ?>
-                        <?php echo $form->text("rssTitle", $num, ["id" => "ccm-pagelist-rssTitle", "name" => "rssTitle"]); ?>
-                    </div>
+                <div id="ccm-pagelist-rssDetails" <?php echo(is_object($rssFeed) ? '' : 'style="display:none;"') ?>>
+                    <?php if (is_object($rssFeed)) { ?>
+                        <?php echo t('RSS Feed can be found here: %s', '<a href="' . h($rssFeed->getFeedURL()) . '" target="_blank">' . $rssFeed->getFeedURL() . '</a>') ?>
+                    <?php } else { ?>
+                        <div class="form-group">
+                            <?php echo $form->label('num', t('RSS Feed Title')); ?>
+                            <?php echo $form->text("rssTitle", $num, ["id" => "ccm-pagelist-rssTitle", "name" => "rssTitle"]); ?>
+                        </div>
 
-                    <div class="form-group">
-                        <?php echo $form->label("rssDescription", ('RSS Feed Description')); ?>
-                        <?php echo $form->textarea("rssDescription"); ?>
-                    </div>
+                        <div class="form-group">
+                            <?php echo $form->label("rssDescription", ('RSS Feed Description')); ?>
+                            <?php echo $form->textarea("rssDescription"); ?>
+                        </div>
 
-                    <div class="form-group">
-                        <?php echo $form->label('', t('RSS Feed Location')); ?>
+                        <div class="form-group">
+                            <?php echo $form->label('', t('RSS Feed Location')); ?>
 
-                        <div class="input-group">
-                            <span class="input-group-text">
-                                <?php echo (string)Url::to('/rss') ?>/
-                            </span>
+                            <div class="input-group">
+                                <span class="input-group-text">
+                                    <?php echo (string)Url::to('/rss') ?>/
+                                </span>
 
-                            <?php echo $form->text("rssHandle"); ?>
+                                <?php echo $form->text("rssHandle"); ?>
+                            </div>
                         </div>
-                    </div>
-                <?php } ?>
+                    <?php } ?>
+                </div>
             </div>
-        </div>
 
-        <div class="form-group">
-            <label class="control-label form-label">
-                <?php echo t('Include Page Name') ?>
-            </label>
+            <div class="form-group">
+                <label class="control-label form-label">
+                    <?php echo t('Include Page Name') ?>
+                </label>
 
-            <div class="form-check">
-                <?php echo $form->radio("includeName", "0", $includeName ? '1' : '0', ["id" => "disableIncludeName", "name" => "includeName"]); ?>
-                <?php echo $form->label("disableIncludeName", t("No"), ["class" => "form-check-label"]); ?>
-            </div>
+                <div class="form-check">
+                    <?php echo $form->radio("disableIncludeName", "0", $includeName ? '1' : '0', ["id" => "disableIncludeName", "name" => "includeName"]); ?>
+                    <?php echo $form->label("disableIncludeName", t("No"), ["class" => "form-check-label"]); ?>
+                </div>
 
-            <div class="form-check">
-                <?php echo $form->radio("includeName", "1", $includeName ? '1' : '0', ["id" => "enableIncludeName", "name" => "includeName"]); ?>
-                <?php echo $form->label("enableIncludeName", t("Yes"), ["class" => "form-check-label"]); ?>
+                <div class="form-check">
+                    <?php echo $form->radio("enableIncludeName", "1", $includeName ? '1' : '0', ["id" => "enableIncludeName", "name" => "includeName"]); ?>
+                    <?php echo $form->label("enableIncludeName", t("Yes"), ["class" => "form-check-label"]); ?>
+                </div>
             </div>
-        </div>
 
-        <div class="form-group">
-            <label class="control-label form-label">
-                <?php echo t('Include Page Description') ?>
-            </label>
+            <div class="form-group">
+                <label class="control-label form-label">
+                    <?php echo t('Include Page Description') ?>
+                </label>
 
-            <div class="form-check">
-                <?php echo $form->radio("includeDescription", "0", $includeDescription ? '1' : '0', ["id" => "disableIncludeDescription", "name" => "includeDescription"]); ?>
-                <?php echo $form->label("disableIncludeDescription", t("No"), ["class" => "form-check-label"]); ?>
-            </div>
+                <div class="form-check">
+                    <?php echo $form->radio("includeDescription", "0", $includeDescription ? '1' : '0', ["id" => "disableIncludeDescription", "name" => "includeDescription"]); ?>
+                    <?php echo $form->label("disableIncludeDescription", t("No"), ["class" => "form-check-label"]); ?>
+                </div>
 
-            <div class="form-check">
-                <?php echo $form->radio("includeDescription", "1", $includeDescription ? '1' : '0', ["id" => "enableIncludeDescription", "name" => "includeDescription"]); ?>
-                <?php echo $form->label("enableIncludeDescription", t("Yes"), ["class" => "form-check-label"]); ?>
-            </div>
+                <div class="form-check">
+                    <?php echo $form->radio("includeDescription", "1", $includeDescription ? '1' : '0', ["id" => "enableIncludeDescription", "name" => "includeDescription"]); ?>
+                    <?php echo $form->label("enableIncludeDescription", t("Yes"), ["class" => "form-check-label"]); ?>
+                </div>
 
-            <div class="ccm-page-list-truncate-description" <?= ($includeDescription ? '' : 'style="display:none;"') ?>>
-                <label class="control-label form-label"><?=t('Display Truncated Description')?></label>
-                <div class="input-group">
-	
-				<?php
-					$config = $app->make('config');
-					$codeVersion = $config->get('concrete.version');
-					if (version_compare($codeVersion, '9.0.0', '<')) {
-						?>
-                        <span class="input-group-addon">
-                            <input id="ccm-pagelist-truncateSummariesOn" name="truncateSummaries" type="checkbox"
-                                   value="1" <?= ($truncateSummaries ? 'checked="checked"' : '') ?> />
-                        </span>
-                        <input class="form-control" id="ccm-pagelist-truncateChars" <?= ($truncateSummaries ? '' : 'disabled="disabled"') ?>
-                               type="text" name="truncateChars" size="3" value="<?= (int) $truncateChars ?>" />
-                        <span class="input-group-addon">
-                            <?= t('characters') ?>
-                        </span>
-						<?php
-					} else {
-						?>
-                        <span class="input-group-text">
+                <div class="ccm-page-list-truncate-description" <?php echo($includeDescription ? '' : 'style="display:none;"') ?>>
+                    <label class="control-label form-label">
+                        <?php echo t('Display Truncated Description') ?>
+                    </label>
+
+                    <div class="input-group">
+                        <span class="<?= $isV9 ? 'input-group-text' : 'input-group-addon' ?>">
+                            <!--suppress HtmlFormInputWithoutLabel -->
                             <input id="ccm-pagelist-truncateSummariesOn" name="truncateSummaries" type="checkbox"
                                    value="1" <?php echo($truncateSummaries ? 'checked="checked"' : '') ?> />
                         </span>
-							
-							<?php
-								$miscFields = ["id" => "ccm-pagelist-truncateChars", "name" => "truncateChars", "step" => 1, "min" => 0];
-								
-								if (!$truncateSummaries) {
-									$miscFields["disabled"] = "disabled";
-								}
-								
-								echo $form->number("truncateChars", (int)$truncateChars, $miscFields);
-							?>
 
-                            <span class="input-group-text">
+                    <?php
+                        if ($isV9) {
+                            $miscFields = ["id" => "ccm-pagelist-truncateChars", "name" => "truncateChars", "step" => 1, "min" => 0];
+                            if (!$truncateSummaries) {
+                                $miscFields["disabled"] = "disabled";
+                            }
+                            echo $form->number("truncateChars", (int)$truncateChars, $miscFields);
+                        } else {
+                            ?>
+                            <input class="form-control" id="ccm-pagelist-truncateChars" <?= ($truncateSummaries ? '' : 'disabled="disabled"') ?>
+                                   type="text" name="truncateChars" size="3" value="<?= (int) $truncateChars ?>" />
+                            <?php
+                        }
+                    ?>
+
+                        <span class="<?= $isV9 ? 'input-group-text' : 'input-group-addon' ?>">
                             <?php echo t('characters') ?>
                         </span>
-						<?php
-					}
-				?>
+                    </div>
                 </div>
             </div>
-    
+
             <div class="form-group">
                 <?php echo $form->label('', t('Include Public Page Date')); ?>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("includeDate", "0", $includeDate ? '1' : '0', ["id" => "disableIncludeDate", "name" => "includeDate"]); ?>
                     <?php echo $form->label("disableIncludeDate", t("No"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("includeDate", "1", $includeDate ? '1' : '0', ["id" => "enableIncludeDate", "name" => "includeDate"]); ?>
                     <?php echo $form->label("enableIncludeDate", t("Yes"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <div class="help-block">
                     <?php echo t('This is usually the date the page is created. It can be changed from the page attributes panel.') ?>
                 </div>
             </div>
-    
+
             <div class="form-group">
                 <label class="control-label form-label">
                     <?php echo t('Display Thumbnail Image') ?>
                 </label>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("displayThumbnail", "0", $displayThumbnail ? '1' : '0', ["id" => "disableIncludeThumbnail", "name" => "displayThumbnail"]); ?>
                     <?php echo $form->label("disableIncludeThumbnail", t("No"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("displayThumbnail", "1", $displayThumbnail ? '1' : '0', ["id" => "enableIncludeThumbnail", "name" => "displayThumbnail"]); ?>
                     <?php echo $form->label("enableIncludeThumbnail", t("Yes"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <?php if (!is_object($thumbnailAttribute)) { ?>
                     <div class="help-block">
                         <?php echo t('You must create an attribute with the \'thumbnail\' handle in order to use this option.') ?>
                     </div>
                 <?php } ?>
             </div>
-    
+
             <div class="form-group">
                 <label class="control-label form-label">
                     <?php echo t('Use Different Link than Page Name') ?>
                 </label>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("useButtonForLink", "0", $useButtonForLink ? '1' : '0', ["id" => "disableUseButtonForLink", "name" => "useButtonForLink"]); ?>
                     <?php echo $form->label("disableUseButtonForLink", t("No"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <div class="form-check">
                     <?php echo $form->radio("useButtonForLink", "1", $useButtonForLink ? '1' : '0', ["id" => "enableUseButtonForLink", "name" => "useButtonForLink"]); ?>
                     <?php echo $form->label("enableUseButtonForLink", t("Yes"), ["class" => "form-check-label"]); ?>
                 </div>
-    
+
                 <div class="ccm-page-list-button-text" <?php echo($useButtonForLink ? '' : 'style="display:none;"') ?>>
                     <div class="form-group">
                         <?php echo $form->label('buttonLinkText', t('Link Text')); ?>
@@ -637,39 +671,34 @@
                     </div>
                 </div>
             </div>
-    
+
             <div class="form-group">
                 <?php echo $form->label('pageListTitle', t('Title of Page List')); ?>
-                
-                    <?php
-                        $config = $app->make('config');
-                        $codeVersion = $config->get('concrete.version');
-                        if (version_compare($codeVersion, '9.0.0', '>')) {
-                            ?>
-                            <div class="input-group">
-                                <?php echo $form->text("pageListTitle", $pageListTitle); ?>
-                                <?php echo $form->select('titleFormat', \Concrete\Core\Block\BlockController::$btTitleFormats, $titleFormat, array('style' => 'width:105px;flex-grow:0;', 'class' => 'form-select')); ?>
-                            </div>
-                            <?php
-                        } else {
-							echo $form->text("pageListTitle", $pageListTitle);
-                        }
-                    ?>
-                
+                <?php
+                    if ($isV9) {
+                        ?>
+                        <div class="input-group">
+                            <?php echo $form->text("pageListTitle", $pageListTitle); ?>
+                            <?php echo $form->select('titleFormat', \Concrete\Core\Block\BlockController::$btTitleFormats, $titleFormat ?? null, array('style' => 'width:105px;flex-grow:0;', 'class' => 'form-select')); ?>
+                        </div>
+                        <?php
+                    } else {
+                        echo $form->text("pageListTitle", $pageListTitle);
+                    }
+                ?>
             </div>
     
             <div class="form-group">
-                <?php echo $form->label("noResultsMessage", ('Message to Display When No Pages Listed.')); ?>
+                <?php echo $form->label("noResultsMessage", t('Message to Display When No Pages Listed')); ?>
                 <?php echo $form->textarea("noResultsMessage", $noResultsMessage); ?>
             </div>
-    
+
             <div class="loader">
                 <i class="fas fa-cog fa-spin"></i>
             </div>
         </fieldset>
     </div>
 
-
     <div class="tab-pane" id="page-list-preview" role="tabpanel">
         <div class="render">
 
@@ -679,8 +708,8 @@
     </div>
 </div>
 
+<!--suppress CssUnusedSymbol -->
 <style type="text/css">
-
     div.pagelist-form div.cover {
         width: 100%;
         height: 100%;
@@ -703,9 +732,12 @@
         display: block !important;
     }
 </style>
+
+<!--suppress EqualityComparisonWithCoercionJS, JSJQueryEfficiency -->
 <script type="application/javascript">
     Concrete.event.publish('pagelist.edit.open');
-    $(function() {
+
+    $(function () {
         $("ul.nav.nav-tabs > li > a").on("click", function() {
             if ($(this).attr("data-tab") == 'page-list-preview' || $(this).attr("id") == "page-list-preview-tab") {
                 $("#page-list-preview").addClass("active");
@@ -715,8 +747,8 @@
                 $("#page-list-settings").addClass("active");
             }
         });
-        
-        $('input[name=topicFilter]').on('change', function() {
+
+        $('input[name=topicFilter]').on('change', function () {
             if ($(this).val() == 'related') {
                 $('div[data-row=related-topic]').show();
                 $('div[data-row=custom-topic]').hide();
@@ -729,20 +761,24 @@
             }
         });
 
-        var treeViewTemplate = $('.tree-view-template');
+        let treeViewTemplate = $('.tree-view-template');
+
+        $('select[name=customTopicAttributeKeyHandle]').on('change', function () {
+            let chosenTree = $(this).find('option:selected').attr('data-topic-tree-id');
 
-        $('select[name=customTopicAttributeKeyHandle]').on('change', function() {
-            var chosenTree = $(this).find('option:selected').attr('data-topic-tree-id');
             $('.tree-view-template').remove();
+
             if (!chosenTree) {
                 return;
             }
+
             $('.tree-view-container').append(treeViewTemplate);
+
             $('.tree-view-template').concreteTree({
                 'treeID': chosenTree,
                 'chooseNodeInForm': true,
-                'selectNodesByKey': [<?=(int) $customTopicTreeNodeID?>],
-                'onSelect' : function(nodes) {
+                'selectNodesByKey': [<?php echo (int)$customTopicTreeNodeID?>],
+                'onSelect': function (nodes) {
                     if (nodes.length) {
                         $('input[name=customTopicTreeNodeID]').val(nodes[0]);
                     } else {
@@ -752,11 +788,12 @@
                 }
             });
         });
+
         $('input[name=topicFilter]:checked').trigger('change');
+
         if ($('#topicFilterCustom').is(':checked')) {
             $('select[name=customTopicAttributeKeyHandle]').trigger('change');
         }
     });
-
 </script>
 

From 44d595b5b0ed7497d22c43bc31e366bd59c855e6 Mon Sep 17 00:00:00 2001
From: Md Biplob Hossain <biplob.ice@gmail.com>
Date: Fri, 16 Feb 2024 17:21:06 +0900
Subject: [PATCH 3/7] Remove redundant values

---
 single_pages/dashboard/ratings/view.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/single_pages/dashboard/ratings/view.php b/single_pages/dashboard/ratings/view.php
index 252caa0..a761f4a 100644
--- a/single_pages/dashboard/ratings/view.php
+++ b/single_pages/dashboard/ratings/view.php
@@ -19,7 +19,7 @@
         /*right: 35px;*/
     }
     div#ccm-dashboard-content-inner{
-        padding-top: 0px !important;
+        padding-top: 0 !important;
     }
     .ccm-header-search-form-input{
         display: inline-block;
@@ -27,8 +27,8 @@
     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

From b58a819c0685696eba6ed1ad6311b2e5bcdcb396 Mon Sep 17 00:00:00 2001
From: Md Biplob Hossain <biplob.ice@gmail.com>
Date: Fri, 16 Feb 2024 17:27:29 +0900
Subject: [PATCH 4/7] Fix undefined variables

---
 blocks/c5j_rating_btn/view.php          |  6 ++++++
 blocks/c5j_rating_page_list/view.php    | 20 ++++++++++++++++++++
 single_pages/dashboard/ratings/view.php |  2 ++
 3 files changed, 28 insertions(+)

diff --git a/blocks/c5j_rating_btn/view.php b/blocks/c5j_rating_btn/view.php
index 048a629..232e1c2 100644
--- a/blocks/c5j_rating_btn/view.php
+++ b/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();
diff --git a/blocks/c5j_rating_page_list/view.php b/blocks/c5j_rating_page_list/view.php
index 838299d..16bcb3f 100644
--- a/blocks/c5j_rating_page_list/view.php
+++ b/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()) {
     ?>
diff --git a/single_pages/dashboard/ratings/view.php b/single_pages/dashboard/ratings/view.php
index a761f4a..829adaa 100644
--- a/single_pages/dashboard/ratings/view.php
+++ b/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{

From 728c7636f105cfa62095798736b0253a032ab493 Mon Sep 17 00:00:00 2001
From: Md Biplob Hossain <biplob.ice@gmail.com>
Date: Fri, 16 Feb 2024 17:29:55 +0900
Subject: [PATCH 5/7] Update version and CHANGELOG.md

---
 CHANGELOG.md   | 4 ++++
 controller.php | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6b8f5c..e4ff8ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## [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
diff --git a/controller.php b/controller.php
index 263e33b..9413e10 100644
--- a/controller.php
+++ b/controller.php
@@ -31,7 +31,7 @@ class Controller extends Package
     /**
      * @var string package version
      */
-    protected $pkgVersion = '1.0.1';
+    protected $pkgVersion = '1.1.0-rc1';
 
     protected $pkgAutoloaderRegistries = [
         'src' => '\C5jRatings',

From bccbd15d8e113092a9ec7b92c612035c71a5a743 Mon Sep 17 00:00:00 2001
From: aleksandr <sasha@macareus.co.jp>
Date: Thu, 25 Jul 2024 15:00:13 +0900
Subject: [PATCH 6/7] feature: separate js function

---
 blocks/c5j_rating_page_list/controller.php |  3 +++
 blocks/c5j_rating_page_list/view.php       | 26 +++++++++++++---------
 js/c5j_ratings.js                          |  8 ++++++-
 src/Traits/RatingTrait.php                 | 17 ++++++++++++++
 4 files changed, 43 insertions(+), 11 deletions(-)

diff --git a/blocks/c5j_rating_page_list/controller.php b/blocks/c5j_rating_page_list/controller.php
index 0bd18af..75bad89 100644
--- a/blocks/c5j_rating_page_list/controller.php
+++ b/blocks/c5j_rating_page_list/controller.php
@@ -329,6 +329,9 @@ public function getPassThruActionAndParameters($parameters): array
             if (isset($parameters[1])) {
                 $parameters[1] = (int) ($parameters[1]);
             }
+        } elseif ($parameters[0] == 'get_rating_list') {
+            $method = 'action_get_rating_list';
+            $parameters = array_slice($parameters, 1);
         } else {
             $parameters = $method = null;
         }
diff --git a/blocks/c5j_rating_page_list/view.php b/blocks/c5j_rating_page_list/view.php
index 16bcb3f..7704547 100644
--- a/blocks/c5j_rating_page_list/view.php
+++ b/blocks/c5j_rating_page_list/view.php
@@ -225,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_rating_list')) ?>";
+                const params = {
+                    token: "<?= $app->make('token')->generate('rating') ?>",
+                    uID: getUserID(),
+                    cIDs: cIDs
+                };
+                updateRatings(url, params, true);
+            }
+        }
+        setRate();
     });
 
     function getUserID() {
diff --git a/js/c5j_ratings.js b/js/c5j_ratings.js
index 1ddeb02..f3bcf3c 100644
--- a/js/c5j_ratings.js
+++ b/js/c5j_ratings.js
@@ -2,12 +2,18 @@ function getRatings(getUrl, params) {
     updateRatings(getUrl, params);
 }
 
-function updateRatings(url, params) {
+function updateRatings(url, params, multi = false) {
     $.ajax({
         url: url,
         type: 'post',
         data: params,
         success: function(data) {
+            if (multi) {
+                data.forEach(function (item) {
+                    updateRatingButtons(item);
+                });
+                return;
+            }
             updateRatingButtons(data);
         }
     });
diff --git a/src/Traits/RatingTrait.php b/src/Traits/RatingTrait.php
index c414fe2..61f2c8b 100644
--- a/src/Traits/RatingTrait.php
+++ b/src/Traits/RatingTrait.php
@@ -45,6 +45,23 @@ public function action_get_ratings(int $bID)
             return JsonResponse::create($this->token->getErrorMessage());
     }
 
+    public function action_get_rating_list(int $bID)
+    {
+        $this->token = $this->app->make('helper/validation/token');
+        $uID = (int) $this->post('uID');
+        if ($this->validateToken('rating', $this->post('token'), $uID)) {
+            $cIDs = $this->post('cIDs');
+            $ratings = [];
+            foreach ($cIDs as $cID) {
+                $ratings[] = $this->getRatings($cID, $uID);
+            }
+
+            return JsonResponse::create($ratings);
+        }
+
+        return JsonResponse::create($this->token->getErrorMessage());
+    }
+
     public function generate($action = '', $time = null, $uID = 0): string
     {
         $app = Application::getFacadeApplication();

From 61c6566590d325872b2979024513edfbd9fb2375 Mon Sep 17 00:00:00 2001
From: aleksandr <sasha@macareus.co.jp>
Date: Fri, 26 Jul 2024 08:32:47 +0900
Subject: [PATCH 7/7] feature: separate js function

---
 blocks/c5j_rating_page_list/controller.php |  3 ---
 blocks/c5j_rating_page_list/view.php       |  6 +++---
 js/c5j_ratings.js                          |  4 ++--
 src/Traits/RatingTrait.php                 | 24 +++++++---------------
 4 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/blocks/c5j_rating_page_list/controller.php b/blocks/c5j_rating_page_list/controller.php
index 75bad89..0bd18af 100644
--- a/blocks/c5j_rating_page_list/controller.php
+++ b/blocks/c5j_rating_page_list/controller.php
@@ -329,9 +329,6 @@ public function getPassThruActionAndParameters($parameters): array
             if (isset($parameters[1])) {
                 $parameters[1] = (int) ($parameters[1]);
             }
-        } elseif ($parameters[0] == 'get_rating_list') {
-            $method = 'action_get_rating_list';
-            $parameters = array_slice($parameters, 1);
         } else {
             $parameters = $method = null;
         }
diff --git a/blocks/c5j_rating_page_list/view.php b/blocks/c5j_rating_page_list/view.php
index 7704547..1ed792a 100644
--- a/blocks/c5j_rating_page_list/view.php
+++ b/blocks/c5j_rating_page_list/view.php
@@ -231,13 +231,13 @@ function setRate() {
                 cIDs.push(this.value);
             });
             if (cIDs.length > 0) {
-                const url = "<?= URL::to($view->action('get_rating_list')) ?>";
+                const url = "<?= URL::to($view->action('get_ratings')) ?>";
                 const params = {
                     token: "<?= $app->make('token')->generate('rating') ?>",
                     uID: getUserID(),
-                    cIDs: cIDs
+                    cID: cIDs
                 };
-                updateRatings(url, params, true);
+                updateRatings(url, params);
             }
         }
         setRate();
diff --git a/js/c5j_ratings.js b/js/c5j_ratings.js
index f3bcf3c..38701bf 100644
--- a/js/c5j_ratings.js
+++ b/js/c5j_ratings.js
@@ -2,13 +2,13 @@ function getRatings(getUrl, params) {
     updateRatings(getUrl, params);
 }
 
-function updateRatings(url, params, multi = false) {
+function updateRatings(url, params) {
     $.ajax({
         url: url,
         type: 'post',
         data: params,
         success: function(data) {
-            if (multi) {
+            if (Array.isArray(params['cID'])) {
                 data.forEach(function (item) {
                     updateRatingButtons(item);
                 });
diff --git a/src/Traits/RatingTrait.php b/src/Traits/RatingTrait.php
index 61f2c8b..620abd5 100644
--- a/src/Traits/RatingTrait.php
+++ b/src/Traits/RatingTrait.php
@@ -37,28 +37,18 @@ public function action_get_ratings(int $bID)
         $this->token = $this->app->make('helper/validation/token');
         $uID = (int) $this->post('uID');
         if ($this->validateToken('rating', $this->post('token'), $uID)) {
-            $cID = (int) $this->post('cID');
-
-            return JsonResponse::create($this->getRatings($cID, $uID));
-        }
-
-            return JsonResponse::create($this->token->getErrorMessage());
-    }
-
-    public function action_get_rating_list(int $bID)
-    {
-        $this->token = $this->app->make('helper/validation/token');
-        $uID = (int) $this->post('uID');
-        if ($this->validateToken('rating', $this->post('token'), $uID)) {
-            $cIDs = $this->post('cIDs');
             $ratings = [];
-            foreach ($cIDs as $cID) {
-                $ratings[] = $this->getRatings($cID, $uID);
+            $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($ratings);
         }
-
         return JsonResponse::create($this->token->getErrorMessage());
     }