replace affcount -> displaycount

the Page::setaffcount() method is now deprecated
It redirect to the new setter

API.md

@@ -55,7 +55,7 @@ Page related api
     ],
     "invites": [],
     "readers": [],
-    "affcount": 1,
+    "displaycount": 1,
     "visitcount": 0,
     "editcount": 3,
     "editby": [],

MANUAL.md

@@ -476,11 +476,11 @@ Will display the number of [edits](#editcount) of the page.
 
 ----
 
-    %AFFCOUNT%
+    %DISPLAYCOUNT%
 
-Will display the number of [affcount](#affcount) of the page.
+Will display the number of [display](#displaycount) of the page.
 
-    <span class="counter affcount">X</span>
+    <span class="counter displaycount">X</span>
 
 
 
@@ -949,7 +949,7 @@ Each page have a dedicated stylesheet, that can be called by other pages using [
 
     visitcount
 
-Count the number of visitors that opened the page. Unlike [affcount](#affcount), only un-connected users are counted this way.
+Count the number of visitors that opened the page. Unlike [displaycount](#displaycount), only un-connected users are counted this way.
 
 ##### Editcount
 
@@ -959,11 +959,11 @@ Count the number of visitors that opened the page. Unlike [affcount](#affcount),
 
 Count the number of time the page has been edited. Even empty edits are counted.
 
-##### Affcount
+##### Displaycount
 
 *readonly*
 
-    affcount
+    displaycount
 
 Count the number of time the page is opened is opened.
 

app/class/Controllerpage.php

@@ -163,7 +163,7 @@ public function read($page)
 
 
             if ($canread) {
-                $this->page->addaffcount();
+                $this->page->adddisplaycount();
                 if ($this->user->isvisitor()) {
                     $this->page->addvisitcount();
                 }

app/class/Model.php

@@ -58,7 +58,7 @@ abstract class Model
         'authors',
         'linkto',
         'visitcount',
-        'affcount',
+        'displaycount',
         'editcount'
     ];
 

app/class/Page.php

@@ -39,7 +39,7 @@ class Page extends Item
     protected $authors;
     protected $invites;
     protected $readers;
-    protected $affcount;
+    protected $displaycount;
     protected $visitcount;
     protected $editcount;
     protected $editby;
@@ -109,9 +109,9 @@ public function reset()
         $this->setauthors([]);
         $this->setinvites([]);
         $this->setreaders([]);
-        $this->setaffcount(0);
         $this->setvisitcount(0);
         $this->seteditcount(0);
+        $this->setdisplaycount(0);
         $this->seteditby([]);
         $this->setsleep(0);
         $this->setredirection('');
@@ -354,17 +354,17 @@ public function readers($type = 'array')
         return $this->invites;
     }
 
-    public function affcount($type = 'int')
+    public function displaycount($type = 'int'): int
     {
-        return $this->affcount;
+        return $this->displaycount;
     }
 
-    public function visitcount($type = 'int')
+    public function visitcount($type = 'int'): int
     {
         return $this->visitcount;
     }
 
-    public function editcount($type = 'int')
+    public function editcount($type = 'int'): int
     {
         return $this->editcount;
     }
@@ -693,12 +693,20 @@ public function setreaders($readers)
         }
     }
 
+    /**
+     * @deprecated 2.4.0 Replaced by displaycount
+     */
     public function setaffcount($affcount)
     {
-        if (is_int($affcount)) {
-            $this->affcount = $affcount;
-        } elseif (is_numeric($affcount)) {
-            $this->affcount = intval($affcount);
+        $this->setdisplaycount($affcount);
+    }
+
+    public function setdisplaycount($displaycount)
+    {
+        if (is_int($displaycount)) {
+            $this->displaycount = $displaycount;
+        } elseif (is_numeric($displaycount)) {
+            $this->displaycount = intval($displaycount);
         }
     }
 
@@ -774,9 +782,9 @@ public function addeditcount()
         $this->editcount++;
     }
 
-    public function addaffcount()
+    public function adddisplaycount()
     {
-        $this->affcount++;
+        $this->displaycount++;
     }
 
     public function addvisitcount()

app/class/Servicepostprocess.php

@@ -20,7 +20,7 @@ class Servicepostprocess
 
     public const VISIT_COUNT    = '%VISITCOUNT%';
     public const EDIT_COUNT     = '%EDITCOUNT%';
-    public const AFF_COUNT      = '%AFFCOUNT%';
+    public const AFF_COUNT      = '%DISPLAYCOUNT%';
 
     public const COUNTERS = [
         self::VISIT_COUNT,
@@ -68,12 +68,12 @@ private function replace(string $text): string
     {
         $visitcount = $this->page->visitcount();
         $editcount = $this->page->editcount();
-        $affcount = $this->page->affcount();
+        $displaycount = $this->page->displaycount();
 
         $replacements = [
             self::VISIT_COUNT => "<span class=\"counter visitcount\">$visitcount</span>",
             self::EDIT_COUNT => "<span class=\"counter editcount\">$editcount</span>",
-            self::AFF_COUNT => "<span class=\"counter affcount\">$affcount</span>",
+            self::AFF_COUNT => "<span class=\"counter displaycount\">$displaycount</span>",
         ];
         return strtr($text, $replacements);
     }

app/view/templates/home.php

@@ -197,10 +197,10 @@
                                 <?= $this->insert('macro_tablesort', ['opt' => $opt, 'th' => 'editcount']) ?>
                             </th>
                             <?php }
-                                if ($columns['affcount']) { ?>
-                            <th class="affcount">
-                                <a href="<?= $opt->sortbyorder('affcount') ?>">aff</a>
-                                <?= $this->insert('macro_tablesort', ['opt' => $opt, 'th' => 'affcount']) ?>
+                                if ($columns['displaycount']) { ?>
+                            <th class="displaycount">
+                                <a href="<?= $opt->sortbyorder('displaycount') ?>">display</a>
+                                <?= $this->insert('macro_tablesort', ['opt' => $opt, 'th' => 'displaycount']) ?>
                             </th>
                             <?php } ?>
                         </tr>
@@ -275,8 +275,8 @@
                                     if ($columns['editcount']) { ?>
                             <td class="editcount"><?= $item->editcount() ?></td>
                             <?php }
-                                    if ($columns['affcount']) { ?>
-                            <td class="affcount"><?= $item->affcount() ?></td>
+                                    if ($columns['displaycount']) { ?>
+                            <td class="displaycount"><?= $item->displaycount() ?></td>
                             <?php } ?>
                         </tr>
 

src/edit.js

@@ -17,7 +17,7 @@ CodeMirror.defineSimpleMode('wcms', {
     // detect a Wcms markup then pass to 'wcms' mode
     start: [
         {
-            regex: /%(?=(HEADER|NAV|ASIDE|MAIN|FOOTER|SUMMARY|LIST|MEDIA|TITLE|DESCRIPTION|DATE|TIME|THUMBNAIL|RSS|AUTHORS|ID|PATH|URL|VISITCOUNT|EDITCOUNT|AFFCOUNT)(\?[^\s]*)?%)/,
+            regex: /%(?=(HEADER|NAV|ASIDE|MAIN|FOOTER|SUMMARY|LIST|MEDIA|TITLE|DESCRIPTION|DATE|TIME|THUMBNAIL|RSS|AUTHORS|ID|PATH|URL|VISITCOUNT|EDITCOUNT|DISPLAYCOUNT)(\?[^\s]*)?%)/,
             token: 'wcms',
             next: 'wcms',
         },

tests/data/ServicerenderTest/body-test.json

@@ -38,7 +38,7 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 16,
+    "displaycount": 16,
     "visitcount": 0,
     "editcount": 48,
     "editby": [],

tests/data/ServicerenderTest/date-time-test.json

@@ -38,7 +38,7 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 0,
+    "displaycount": 0,
     "visitcount": 0,
     "editcount": 0,
     "editby": [],

tests/data/ServicerenderTest/empty-test.json

@@ -38,7 +38,7 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 0,
+    "displaycount": 0,
     "visitcount": 0,
     "editcount": 0,
     "editby": [],

tests/data/ServicerenderTest/external-links-test.json

@@ -38,7 +38,7 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 85,
+    "displaycount": 85,
     "visitcount": 0,
     "editcount": 24,
     "editby": [],

tests/data/ServicerenderTest/markdown-test-2.json

@@ -38,12 +38,12 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 2,
+    "displaycount": 2,
     "visitcount": 0,
     "editcount": 1,
     "editby": [],
     "sleep": 0,
     "redirection": "",
     "refresh": 0,
     "password": null
-}
+}

tests/data/ServicerenderTest/markdown-test.json

@@ -38,12 +38,12 @@
     ],
     "invites": [],
     "readers": [],
-    "affcount": 9,
+    "displaycount": 9,
     "visitcount": 0,
     "editcount": 14,
     "editby": [],
     "sleep": 0,
     "redirection": "",
     "refresh": 0,
     "password": null
-}
+}