do some renaming

Classes/Controller/BackendController.php

@@ -23,13 +23,13 @@ class BackendController extends ActionController
     protected ModuleTemplate $moduleTemplate;
     protected PageRenderer $pageRenderer;
 
-    /**
-     * @var activePageRepository
-     */
-    protected $activePageRepository;
+    protected Utilities $utilities;
+
+    protected  ActivePageRepository $activePageRepository;
 
     public function __construct(
-        ActivePageRepository $activePageRepository
+        ActivePageRepository $activePageRepository,
+
     ) {
         $this->activePageRepository = $activePageRepository;
     }
@@ -44,12 +44,12 @@ class BackendController extends ActionController
             ],
             'expiredlast30' => [
                 'controller' => 'Backend',
-                'action' => 'showLast30',
+                'action' => 'showLast30Days',
                 'label' => 'Beiträge, die in den letzten 30 Tagen ausgelaufen sind'
             ],
             'expiredlast90' => [
                 'controller' => 'Backend',
-                'action' => 'showLast90',
+                'action' => 'showLast90Days',
                 'label' => 'Beiträge, die in den letzten 90 Tagen ausgelaufen sind'
             ],
         ];
@@ -100,21 +100,8 @@ class BackendController extends ActionController
         $activePages = $this->activePageRepository->findActivePagesAndPageCreatetors();
         $itemsperpage = $this->settings['itemsPerPage'] ?? 50;
 
-        $pageObjectArray = [];
-
-        foreach ($activePages as $activePage) {
-            $pageObj = new ActivePage();
-            $pageObj->setUid($activePage['uid']);
-            $pageObj->setStarttime($activePage['starttime']);
-            $pageObj->setEndtime($activePage['endtime']);
-            $pageObj->setTitle($activePage['title']);
-            $pageObj->setRoof($activePage['roof']);
-            $pageObj->setCategory($this->utilities->createCategoryFromSlug($activePage['slug']));
-            $pageObj->setCreator($activePage['username']);
-            $pageObj->setFullName($activePage['realName']);
+        $pageObjectArray = $this->createPageObjectsFromArrayData($activePages);
 
-            array_push($pageObjectArray, $pageObj);
-        }
         $currentPage = $this->request->hasArgument('currentPage') ? $this->request->getArgument('currentPage') : 1;
 
         $this->buildPagination($pageObjectArray, $itemsperpage, $currentPage);
@@ -123,59 +110,33 @@ class BackendController extends ActionController
         return $this->htmlResponse($this->moduleTemplate->renderContent());
     }
 
-    public function showLast30Action()
+    public function showLast30DaysAction()
     {
-        $this->utilities = GeneralUtility::makeInstance(Utilities::class);
-        $activePagesExpiredInlast30days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(30);
-        $itemsperpage = $this->settings['itemsPerPage'] ?? 50;
-
-        $pageObjectArray = [];
+        $activePagesExpiredInLast30days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(30);
+        $itemsPerPage = $this->settings['itemsPerPage'] ?? 50;
 
-        foreach ($activePagesExpiredInlast30days as $activePage) {
-            $pageObj = new ActivePage();
-            $pageObj->setUid($activePage['uid']);
-            $pageObj->setStarttime($activePage['starttime']);
-            $pageObj->setEndtime($activePage['endtime']);
-            $pageObj->setTitle($activePage['title']);
-            $pageObj->setRoof($activePage['roof']);
-            $pageObj->setCategory($this->utilities->createCategoryFromSlug($activePage['slug']));
-            $pageObj->setCreator($activePage['username']);
-            $pageObj->setFullName($activePage['realName']);
+        $pageObjectArray = $this->createPageObjectsFromArrayData($activePagesExpiredInLast30days);
 
-            array_push($pageObjectArray, $pageObj);
-        }
         $currentPage = $this->request->hasArgument('currentPage') ? $this->request->getArgument('currentPage') : 1;
 
-        $this->buildPagination($pageObjectArray, $itemsperpage, $currentPage);
+        $this->buildPagination($pageObjectArray, $itemsPerPage, $currentPage);
 
         $this->moduleTemplate->setContent($this->view->render());
         return $this->htmlResponse($this->moduleTemplate->renderContent());
     }
 
-    public function showLast90Action()
+    public function showLast90DaysAction()
     {
-        $this->utilities = GeneralUtility::makeInstance(Utilities::class);
-        $activePagesExpiredInlast90days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(90);
-        $itemsperpage = $this->settings['itemsPerPage'] ?? 50;
+        //$this->utilities = GeneralUtility::makeInstance(Utilities::class);
+        $activePagesExpiredInLast90days = $this->activePageRepository->findExpiredRecordsInTheLast30OR90Days(90);
+        $itemsPerPage = $this->settings['itemsPerPage'] ?? 50;
 
-        $pageObjectArray = [];
+        $pageObjectArray = $this->createPageObjectsFromArrayData($activePagesExpiredInLast90days);
 
-        foreach ($activePagesExpiredInlast90days as $activePage) {
-            $pageObj = new ActivePage();
-            $pageObj->setUid($activePage['uid']);
-            $pageObj->setStarttime($activePage['starttime']);
-            $pageObj->setEndtime($activePage['endtime']);
-            $pageObj->setTitle($activePage['title']);
-            $pageObj->setRoof($activePage['roof']);
-            $pageObj->setCategory($this->utilities->createCategoryFromSlug($activePage['slug']));
-            $pageObj->setCreator($activePage['username']);
-            $pageObj->setFullName($activePage['realName']);
 
-            array_push($pageObjectArray, $pageObj);
-        }
         $currentPage = $this->request->hasArgument('currentPage') ? $this->request->getArgument('currentPage') : 1;
 
-        $this->buildPagination($pageObjectArray, $itemsperpage, $currentPage);
+        $this->buildPagination($pageObjectArray, $itemsPerPage, $currentPage);
 
         $this->moduleTemplate->setContent($this->view->render());
         return $this->htmlResponse($this->moduleTemplate->renderContent());
@@ -194,26 +155,26 @@ class BackendController extends ActionController
         $totalNumberOfRecords = count($activePages);
 
         $cPage = $arrayPaginator->getCurrentPageNumber();
-        $controlleractionName = $this->request->getControllerActionName();
-        $actioName = '';
+        $controllerActionName = $this->request->getControllerActionName();
+        $actionName = '';
 
-        switch($controlleractionName) {
+        switch($controllerActionName) {
             case 'index':
                 $actionName = 'index';
                 break;
-            case 'showLast30':
-                $actionName = 'showLast30';
+            case 'showLast30Days':
+                $actionName = 'showLast30Days';
                 break;
-            case 'showLast90':
-                $actionName = 'showLast90';
+            case 'showLast90Days':
+                $actionName = 'showLast90Days';
                 break;
         }
 
         $this->view->assignMultiple(
             [
-                'cpage' => $cPage,
+                'cPage' => $cPage,
                 'totalRecords' => $totalNumberOfRecords,
-                'activepages' => $activePages,
+                'activePages' => $activePages,
                 'paginator' => $arrayPaginator,
                 'paging' => $paging,
                 'pages' => range(1, $paging->getLastPageNumber()),
@@ -221,4 +182,27 @@ class BackendController extends ActionController
             ]
         );
     }
+
+    protected function createPageObjectsFromArrayData(array $data)
+    {
+        $pageObjectArray = [];
+        $this->utilities = GeneralUtility::makeInstance(Utilities::class);
+
+        foreach ($data as $activePage) {
+            $pageObj = new ActivePage();
+            $pageObj->setUid($activePage['uid']);
+            $pageObj->setStarttime($activePage['starttime']);
+            $pageObj->setEndtime($activePage['endtime']);
+            $pageObj->setTitle($activePage['title']);
+            $pageObj->setRoof($activePage['roof']);
+            $pageObj->setCategory($this->utilities->createCategoryFromSlug($activePage['slug']));
+            $pageObj->setCreator($activePage['username']);
+            $pageObj->setFullName($activePage['realName']);
+
+            $pageObjectArray[] = $pageObj;
+        }
+        return $pageObjectArray;
+
+    }
+
 }

Classes/Utils/Utilities.php

@@ -9,13 +9,15 @@ class Utilities
      *
      */
 
-    public function createCategoryFromSlug($slug)
+    public function createCategoryFromSlug($slug) : string
     {
+        $value = null;
         if (substr($slug, 0, 1) === '/') $value = ltrim($slug, '/');
 
         if (substr($slug, 0, 1) === '_') $value = ltrim($slug, '_');
 
         #TODO: $value is probably undefined. So please define a 'default'!
         return  explode('/', $value)[0];
+
     }
 }

Resources/Private/Templates/Backend/Index.html

@@ -50,7 +50,7 @@
         </f:if>
     </table>
     <!-- Render your paging -->
-    <f:render partial="Paging.html" arguments="{totalrecords: totalRecords, cpage: cPage, paging: paging, pages: pages, paginator: paginator, actionName: actionName}" />
+    <f:render partial="Paging.html" arguments="{totalRecords: totalRecords, cPage: cPage, paging: paging, pages: pages, paginator: paginator, actionName: actionName}" />
 
 </f:section>
 

ext_tables.php

@@ -15,7 +15,7 @@ call_user_func(
       'pgmgt',
       'bottom',
       [
-        \Meramo\Pagemanager\Controller\BackendController::class => 'index,showLast30,showLast90',
+        \Meramo\Pagemanager\Controller\BackendController::class => 'index,showLast30Days,showLast90Days',
 
       ],
       [