From fffba1655aa792a66da186cb8ea328682c456177 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 7 Sep 2022 23:37:07 +0200
Subject: [PATCH 01/14] refactor perm check

---
 helper.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/helper.php b/helper.php
index 9621f1f..52165c3 100644
--- a/helper.php
+++ b/helper.php
@@ -419,9 +419,11 @@ function _vcategories($cat) {
      * Returns access classification for VTODO
      */
     function _vclass($id) {
-        global $USERINFO; // checks access rights for anonymous user
-        if (auth_aclcheck($id, '', $USERINFO['grps'])) return 'PUBLIC';
-        else return 'PRIVATE';
+        if (auth_quickaclcheck($id) >= AUTH_READ) {
+            return 'PUBLIC';
+        } else {
+            return 'PRIVATE';
+        }
     }
 
     /**

From 54067a023e152f08413ecbda7b37146c1c079263 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 7 Sep 2022 23:38:25 +0200
Subject: [PATCH 02/14] replace deprecated trigger_event

---
 helper.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/helper.php b/helper.php
index 52165c3..59a0649 100644
--- a/helper.php
+++ b/helper.php
@@ -1,4 +1,7 @@
 <?php
+
+use dokuwiki\Extension\Event;
+
 /**
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author     Esther Brunner <wikidesign@gmail.com>
@@ -311,7 +314,7 @@ function _notify($task) {
 
         if ((!$conf['subscribers']) && (!$conf['notify'])) return; //subscribers enabled?
         $data = array('id' => $ID, 'addresslist' => '', 'self' => false);
-        trigger_event('COMMON_NOTIFY_ADDRESSLIST', $data, 'subscription_addresslist');
+        Event::createAndTrigger('COMMON_NOTIFY_ADDRESSLIST', $data, 'subscription_addresslist');
         $bcc = $data['addresslist'];
         if ((empty($bcc)) && (!$conf['notify'])) return;
         $to   = $conf['notify'];

From 907153eeac9dfd6f4620f4d3ddeff81484301ecb Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 7 Sep 2022 23:38:55 +0200
Subject: [PATCH 03/14] add missing perm info

---
 helper.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/helper.php b/helper.php
index 59a0649..c487950 100644
--- a/helper.php
+++ b/helper.php
@@ -133,6 +133,7 @@ function getTasks($ns, $num = NULL, $filter = '', $user = NULL) {
                 elseif (($date + 86400 < time()) && ($filter == 'due')) continue;
                 elseif (($date + 86400 > time()) && ($filter == 'overdue')) continue;
             } 
+            $perm = auth_quickaclcheck($id);
 
             $result[$task['key']] = array(
                     'id'       => $id,

From 168a1d1c271bdba2e9e24bba7303e554d704466d Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 7 Sep 2022 23:39:36 +0200
Subject: [PATCH 04/14] helper reformatting

---
 helper.php | 263 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 156 insertions(+), 107 deletions(-)

diff --git a/helper.php b/helper.php
index c487950..dec5e27 100644
--- a/helper.php
+++ b/helper.php
@@ -8,54 +8,56 @@
  */
 
 class helper_plugin_task extends DokuWiki_Plugin {
-  
+
     function getMethods() {
-        $result = array();
-        $result[] = array(
+        $result = [];
+        $result[] = [
                 'name'   => 'th',
                 'desc'   => 'returns the header of the task column for pagelist',
-                'return' => array('header' => 'string'),
-                );
-        $result[] = array(
+                'return' => ['header' => 'string'],
+        ];
+        $result[] = [
                 'name'   => 'td',
                 'desc'   => 'returns the status of the task',
-                'params' => array('id' => 'string'),
-                'return' => array('label' => 'string'),
-                );
-        $result[] = array(
+                'params' => ['id' => 'string'],
+                'return' => ['label' => 'string'],
+        ];
+        $result[] = [
                 'name'   => 'getTasks',
                 'desc'   => 'get task pages, sorted by priority',
-                'params' => array(
+                'params' => [
                     'namespace' => 'string',
                     'number (optional)' => 'integer',
-                    'filter (optional)' => 'string'),
-                'return' => array('pages' => 'array'),
-                );
-        $result[] = array(
+                    'filter (optional)' => 'string'],
+                'return' => ['pages' => 'array'],
+        ];
+        $result[] = [
                 'name'   => 'readTask',
                 'desc'   => 'get a single task metafile',
-                'params' => array('id' => 'string'),
-                'return' => array('task on success, else false' => 'array, (boolean)'),
-                );
-        $result[] = array(
+                'params' => ['id' => 'string'],
+                'return' => ['task on success, else false' => 'array, (boolean)'],
+        ];
+        $result[] = [
                 'name'   => 'writeTask',
                 'desc'   => 'save task metdata in a file',
-                'params' => array(
+                'params' => [
                     'id' => 'string',
-                    'task' => 'array'),
-                'return' => array('success' => 'boolean'),
-                );
-        $result[] = array(
+                    'task' => 'array'],
+                'return' => ['success' => 'boolean'],
+        ];
+        $result[] = [
                 'name'   => 'statusLabel',
                 'desc'   => 'returns the status label for a given integer',
-                'params' => array('status' => 'integer'),
-                'return' => array('label' => 'string'),
-                );
+                'params' => ['status' => 'integer'],
+                'return' => ['label' => 'string'],
+        ];
         return $result;
     }
-  
+
     /**
      * Returns the column header for the Pagelist Plugin
+     *
+     * @return string header text, escaped by Pagelist
      */
     function th() {
         return $this->getLang('status');
@@ -63,6 +65,12 @@ function th() {
 
     /**
      * Returns the status of the task
+     *
+     * Used by pagelist plugin for filling the cells of the table
+     * and in listing by the tagfilter
+     *
+     * @param string $id page id of row
+     * @return string html with escaped values
      */
     function td($id) {
         $task = $this->readTask($id);
@@ -72,23 +80,23 @@ function td($id) {
     /**
      * Returns an array of task pages, sorted by priority
      */
-    function getTasks($ns, $num = NULL, $filter = '', $user = NULL) {
+    function getTasks($ns, $num = null, $filter = '', $user = null) {
         global $conf;
 
-        if (!$filter) $filter = strtolower($_REQUEST['filter']);
-
-        require_once(DOKU_INC.'inc/search.php');
+        if (!$filter) {
+            $filter = strtolower($_REQUEST['filter']);
+        }
 
         $dir = $conf['datadir'].($ns ? '/'.str_replace(':', '/', $ns): '');
 
         // returns the list of pages in the given namespace and it's subspaces
-        $items = array();
-        $opts = array();
+        $items = [];
+        $opts = [];
         $ns = utf8_encodeFN(str_replace(':', '/', $ns));
         search($items, $conf['datadir'], 'search_allpages', $opts, $ns);
 
         // add pages with comments to result
-        $result = array();
+        $result = [];
         foreach ($items as $item) {
             $id = $item['id'];
 
@@ -117,25 +125,25 @@ function getTasks($ns, $num = NULL, $filter = '', $user = NULL) {
                     if ($task['status'] != 4) continue;
                 } else {
                     // No pure status filter, skip done and closed tasks
-                    if (($task['status'] < 0) || ($task['status'] > 2)) continue;
+                    if ($task['status'] < 0 || $task['status'] > 2) continue;
                 }
             }
 
             // skip other's tasks if filter is 'my'
-            if (($filter == 'my') && (!$responsible)) continue;
+            if ($filter == 'my' && !$responsible) continue;
 
             // skip assigned and not new tasks if filter is 'new'
-            if (($filter == 'new') && ($task['user']['name'] || ($task['status'] != 0))) continue;
+            if ($filter == 'new' && ($task['user']['name'] || $task['status'] != 0)) continue;
 
-            // filter is 'due' or 'overdue' 
-            if (in_array($filter, array('due', 'overdue'))) {
+            // filter is 'due' or 'overdue'
+            if (in_array($filter, ['due', 'overdue'])) {
                 if (!$date || ($date > time()) || ($task['status'] > 2)) continue;
                 elseif (($date + 86400 < time()) && ($filter == 'due')) continue;
                 elseif (($date + 86400 > time()) && ($filter == 'overdue')) continue;
-            } 
+            }
             $perm = auth_quickaclcheck($id);
 
-            $result[$task['key']] = array(
+            $result[$task['key']] = [
                     'id'       => $id,
                     'date'     => $date,
                     'user'     => $task['user']['name'],
@@ -144,13 +152,15 @@ function getTasks($ns, $num = NULL, $filter = '', $user = NULL) {
                     'perm'     => $perm,
                     'file'     => $task['file'],
                     'exists'   => true,
-                    );
+            ];
         }
 
         // finally sort by time of last comment
         krsort($result);
 
-        if (is_numeric($num)) $result = array_slice($result, 0, $num);
+        if (is_numeric($num)) {
+            $result = array_slice($result, 0, $num);
+        }
 
         return $result;
     }
@@ -163,15 +173,19 @@ function readTask($id) {
         if (!@file_exists($file)) {
             $data = p_get_metadata($id, 'task');
             if (is_array($data)) {
-                $data['date'] = array('due' => $data['date']);
-                $data['user'] = array('name' => $data['user']);
-                $meta = array('task' => NULL);
-                if ($this->writeTask($id, $data)) p_set_metadata($id, $meta);
+                $data['date'] = ['due' => $data['date']];
+                $data['user'] = ['name' => $data['user']];
+                $meta = ['task' => null];
+                if ($this->writeTask($id, $data)) {
+                    p_set_metadata($id, $meta);
+                }
             }
         } else {
             $data = unserialize(io_readFile($file, false));
         }
-        if (!is_array($data) || empty($data)) return false;
+        if (!is_array($data) || empty($data)) {
+            return false;
+        }
         $data['file']   = $file;
         $data['exists'] = true;
         return $data;
@@ -181,22 +195,28 @@ function readTask($id) {
      * Saves the .task metafile
      */
     function writeTask($id, $data) {
-        if (!is_array($data)) return false;
-        $file = ($data['file'] ? $data['file'] : metaFN($id, '.task'));
+        if (!is_array($data)) {
+            return false;
+        }
+        $file = ($data['file'] ?: metaFN($id, '.task'));
 
         // remove file and exists keys
         unset($data['file']);
         unset($data['exists']);
 
         // set creation or modification time
-        if (!is_array($data['date'])) $data['date'] = array('due' => $data['date']);
+        if (!is_array($data['date'])) {
+            $data['date'] = ['due' => $data['date']];
+        }
         if (!@file_exists($file) || !$data['date']['created']) {
             $data['date']['created'] = time();
         } else {
             $data['date']['modified'] = time();
         }
 
-        if (!is_array($data['user'])) $data['user'] = array('name' => $data['user']);
+        if (!is_array($data['user'])) {
+            $data['user'] = ['name' => $data['user']];
+        }
 
         if (!isset($data['status'])) {    // make sure we don't overwrite status
             $current = unserialize(io_readFile($file, false));
@@ -259,11 +279,17 @@ function priorityLabel($priority) {
      * Is the given task assigned to the current user?
      */
     function _isResponsible($user) {
-        global $INFO;
+        global $INFO, $INPUT;
 
-        if (!$user) return false;
+        if (!$user) {
+            return false;
+        }
 
-        if (isset($user['id']) && $user['id'] == $_SERVER['REMOTE_USER'] || isset($user['name']) && $user['name'] == $INFO['userinfo']['name'] || $user == $INFO['userinfo']['name']) {
+        if (
+            isset($user['id']) && $user['id'] == $INPUT->server->str('REMOTE_USER')
+            || isset($user['name']) && $user['name'] == $INFO['userinfo']['name']
+            || $user == $INFO['userinfo']['name']
+        ) {
             return true;
         }
 
@@ -274,7 +300,9 @@ function _isResponsible($user) {
      * Interpret date with strtotime()
      */
     function _interpretDate($str) {
-        if (!$str) return NULL;
+        if (!$str) {
+            return null;
+        }
 
         // only year given -> time till end of year
         if (preg_match("/^\d{4}$/", $str)) {
@@ -297,7 +325,9 @@ function _interpretDate($str) {
 
         // convert to UNIX time
         $date = strtotime($str);
-        if ($date === -1) $date = NULL;
+        if ($date === -1) {
+            $date = null;
+        }
         return $date;
     }
 
@@ -313,11 +343,16 @@ function _notify($task) {
         global $conf;
         global $ID;
 
-        if ((!$conf['subscribers']) && (!$conf['notify'])) return; //subscribers enabled?
-        $data = array('id' => $ID, 'addresslist' => '', 'self' => false);
+        //subscribers enabled?
+        if (!$conf['subscribers'] && !$conf['notify']) {
+            return;
+        }
+        $data = ['id' => $ID, 'addresslist' => '', 'self' => false];
         Event::createAndTrigger('COMMON_NOTIFY_ADDRESSLIST', $data, 'subscription_addresslist');
         $bcc = $data['addresslist'];
-        if ((empty($bcc)) && (!$conf['notify'])) return;
+        if (empty($bcc) && !$conf['notify']) {
+            return;
+        }
         $to   = $conf['notify'];
         $text = io_readFile($this->localFN('subscribermail'));
 
@@ -336,8 +371,11 @@ function _notify($task) {
         $text = str_replace('@DOKUWIKIURL@', DOKU_URL, $text);
 
         $subject = '['.$conf['title'].'] ';
-        if ($task['status'] == 0) $subject .= $this->getLang('mail_newtask');
-        else $subject .= $this->getLang('mail_changedtask');
+        if ($task['status'] == 0) {
+            $subject .= $this->getLang('mail_newtask');
+        } else {
+            $subject .= $this->getLang('mail_changedtask');
+        }
 
         mail_send($to, $subject, $text, $conf['mailfrom'], '', $bcc);
     }
@@ -354,23 +392,32 @@ function _vtodo($id, $task) {
             'UID:'.$id.'@'.$_SERVER['SERVER_NAME'].CRLF.
             'URL:'.wl($id, '', true, '&').CRLF.
             'SUMMARY:'.$this->_vsc($meta['title']).CRLF;
-        if ($meta['description']['abstract'])
-            $ret .= 'DESCRIPTION:'.$this->_vsc($meta['description']['abstract']).CRLF;
-        if ($meta['subject'])
-            $ret .= 'CATEGORIES:'.$this->_vcategories($meta['subject']).CRLF;
-        if ($task['date']['created'])
-            $ret .= 'CREATED:'.$this->_vdate($task['date']['created']).CRLF;
-        if ($task['date']['modified'])
-            $ret .= 'LAST-MODIFIED:'.$this->_vdate($task['date']['modified']).CRLF;
-        if ($task['date']['due'])
-            $ret .= 'DUE:'.$this->_vdate($task['date']['due']).CRLF;
-        if ($task['date']['completed'])
-            $ret .= 'COMPLETED:'.$this->_vdate($task['date']['completed']).CRLF;
-        if ($task['user']) $ret .= 'ORGANIZER;CN="'.$this->_vsc($task['user']['name']).'":'.
-            'MAILTO:'.$task['user']['mail'].CRLF;
+        if ($meta['description']['abstract']) {
+            $ret .= 'DESCRIPTION:' . $this->_vsc($meta['description']['abstract']) . CRLF;
+        }
+        if ($meta['subject']) {
+            $ret .= 'CATEGORIES:' . $this->_vcategories($meta['subject']) . CRLF;
+        }
+        if ($task['date']['created']) {
+            $ret .= 'CREATED:' . $this->_vdate($task['date']['created']) . CRLF;
+        }
+        if ($task['date']['modified']) {
+            $ret .= 'LAST-MODIFIED:' . $this->_vdate($task['date']['modified']) . CRLF;
+        }
+        if ($task['date']['due']) {
+            $ret .= 'DUE:' . $this->_vdate($task['date']['due']) . CRLF;
+        }
+        if ($task['date']['completed']) {
+            $ret .= 'COMPLETED:' . $this->_vdate($task['date']['completed']) . CRLF;
+        }
+        if ($task['user']) {
+            $ret .= 'ORGANIZER;CN="' . $this->_vsc($task['user']['name']) . '":' .
+                'MAILTO:' . $task['user']['mail'] . CRLF;
+        }
         $ret .= 'STATUS:'.$this->_vstatus($task['status']).CRLF;
-        if (is_numeric($task['priority']))
-            $ret .= 'PRIORITY:'.(7 - ($task['priority'] * 2)).CRLF;
+        if (is_numeric($task['priority'])) {
+            $ret .= 'PRIORITY:' . (7 - ($task['priority'] * 2)) . CRLF;
+        }
         $ret .= 'CLASS:'.$this->_vclass($id).CRLF.
             'END:VTODO'.CRLF;
         return $ret;
@@ -380,8 +427,8 @@ function _vtodo($id, $task) {
      * Encodes vCard / iCal special characters
      */
     function _vsc($string) {
-        $search = array("\\", ",", ";", "\n", "\r");
-        $replace = array("\\\\", "\\,", "\\;", "\\n", "\\n");
+        $search = ["\\", ",", ";", "\n", "\r"];
+        $replace = ["\\\\", "\\,", "\\;", "\\n", "\\n"];
         return str_replace($search, $replace, $string);
     }
 
@@ -389,8 +436,11 @@ function _vsc($string) {
      * Generates YYYYMMDD"T"hhmmss"Z" UTC time date format (ISO 8601 / RFC 3339)
      */
     function _vdate($date, $extended = false) {
-        if ($extended) return strftime('%Y-%m-%dT%H:%M:%SZ', $date);
-        else return strftime('%Y%m%dT%H%M%SZ', $date);
+        if ($extended) {
+            return strftime('%Y-%m-%dT%H:%M:%SZ', $date);
+        } else {
+            return strftime('%Y%m%dT%H%M%SZ', $date);
+        }
     }
 
     /**
@@ -400,10 +450,10 @@ function _vstatus($status) {
         switch ($status) {
             case -1:
                 return 'CANCELLED';
-            case 1: 
+            case 1:
             case 2:
                 return 'IN-PROCESS';
-            case 3: 
+            case 3:
             case 4:
                 return 'COMPLETED';
             default:
@@ -415,7 +465,9 @@ function _vstatus($status) {
      * Returns VTODO categories
      */
     function _vcategories($cat) {
-        if (!is_array($cat)) $cat = explode(' ', $cat);
+        if (!is_array($cat)) {
+            $cat = explode(' ', $cat);
+        }
         return join(',', $this->_vsc($cat));
     }
 
@@ -433,16 +485,16 @@ function _vclass($id) {
     /**
      * Show the form to create a new task.
      * The function just forwards the call to the old or new function.
-     * 
+     *
      * @param string $ns              The DokuWiki namespace in which the new task
      *                                page shall be created
      * @param bool   $selectUser      If false then create a simple input line for the user field.
      *                                If true then create a drop down list.
-     * @param bool   $selectUserGroup If not NULL and if $selectUser==true then the drop down list
+     * @param bool   $selectUserGroup If not null and if $selectUser==true then the drop down list
      *                                for the user field will only show users who are members of
      *                                the user group given in $selectUserGroup.
      */
-    function _newTaskForm($ns, $selectUser=false, $selectUserGroup=NULL) {
+    function _newTaskForm($ns, $selectUser=false, $selectUserGroup=null) {
         if (class_exists('dokuwiki\Form\Form')) {
             return $this->_newTaskFormNew($ns, $selectUser, $selectUserGroup);
         } else {
@@ -453,13 +505,13 @@ function _newTaskForm($ns, $selectUser=false, $selectUserGroup=NULL) {
     /**
      * Show the form to create a new task.
      * This is the new version using class dokuwiki\Form\Form.
-     * 
+     *
      * @see _newTaskForm
      */
-    protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL) {
+    protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null) {
         global $ID, $lang, $INFO, $auth;
 
-        $form = new dokuwiki\Form\Form(array('id' => 'task__newtask_form'));
+        $form = new dokuwiki\Form\Form(['id' => 'task__newtask_form']);
         $pos = 1;
 
         // Open fieldset
@@ -471,7 +523,7 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL
         $form->setHiddenField ('ns', $ns);
 
         // Set input filed for task title
-        $input = $form->addTextInput('title', NULL, $pos++);
+        $input = $form->addTextInput('title', null, $pos++);
         $input->attr('id', 'task__newtask_title');
         $input->attr('size', '40');
 
@@ -479,19 +531,19 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL
         $form->addHTML('<table class="blind"><tr><th>'.$this->getLang('user').':</th><td>', $pos++);
         if(!$selectUser) {
             // Old way input field
-            $input = $form->addTextInput('user', NULL, $pos++);
+            $input = $form->addTextInput('user', null, $pos++);
             $input->attr('value', hsc($INFO['userinfo']['name']));
         } else {
             // Select user from drop down list
-            $filter = array();
+            $filter = [];
             $filter['grps'] = $selectUserGroup;
-            $options = array();
+            $options = [];
             if ($auth) {
                 foreach ($auth->retrieveUsers(0, 0, $filter) as $curr_user) {
                     $options [] = $curr_user['name'];
                 }
             }
-            $input = $form->addDropdown('user', $options, NULL, $pos++);
+            $input = $form->addDropdown('user', $options, null, $pos++);
             $input->val($INFO['userinfo']['name']);
         }
         $form->addHTML('</td></tr>', $pos++);
@@ -499,21 +551,19 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL
         // Field for due date
         if ($this->getConf('datefield')) {
             $form->addHTML('<tr><th>'.$this->getLang('date').':</th><td>', $pos++);
-            $input = $form->addTextInput('date', NULL, $pos++);
+            $input = $form->addTextInput('date', null, $pos++);
             $input->attr('value', date('Y-m-d'));
             $form->addHTML('</td></tr>', $pos++);
         }
 
         // Select priority from drop down list
         $form->addHTML('<tr><th>'.$this->getLang('priority').':</th><td>');
-        $filter = array();
-        $filter['grps'] = $selectUserGroup;
-        $options = array();
+        $options = [];
         $options [''] = $this->getLang('low');
         $options ['!'] = $this->getLang('medium');
         $options ['!!'] = $this->getLang('high');
         $options ['!!!'] = $this->getLang('critical');
-        $input = $form->addDropdown('priority', $options, NULL, $pos++);
+        $input = $form->addDropdown('priority', $options, null, $pos++);
         $input->attr('size', '1');
         $input->val($this->getLang('low'));
         $form->addHTML('</td></tr>', $pos++);
@@ -521,7 +571,7 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL
         $form->addHTML('</table>', $pos++);
 
         // Add button
-        $form->addButton(NULL, $lang['btn_create'], $pos++);
+        $form->addButton(null, $lang['btn_create'], $pos++);
 
         // Close fieldset
         $form->addFieldsetClose($pos++);
@@ -537,10 +587,10 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=NULL
     /**
      * Show the form to create a new task.
      * This is the old version, creating all HTML code on its own.
-     * 
+     *
      * @see _newTaskForm
      */
-    protected function _newTaskFormOld($ns, $selectUser=false, $selectUserGroup=NULL) {
+    protected function _newTaskFormOld($ns, $selectUser=false, $selectUserGroup=null) {
         global $ID, $lang, $INFO, $auth;
 
         $ret =  '<div class="newtask_form">';
@@ -562,7 +612,7 @@ protected function _newTaskFormOld($ns, $selectUser=false, $selectUserGroup=NULL
             $ret .= '<th>'.$this->getLang('user').':</th>';
             $ret .= '<td><select name="user">';
 
-            $filter = array();
+            $filter = [];
             $filter['grps'] = $selectUserGroup;
             if ($auth) {
                 foreach ($auth->retrieveUsers(0, 0, $filter) as $curr_user) {
@@ -590,4 +640,3 @@ protected function _newTaskFormOld($ns, $selectUser=false, $selectUserGroup=NULL
         return $ret;
     }
 }
-// vim:ts=4:sw=4:et:enc=utf-8:

From 944e1d4b1518e2c0ede3c5a4c5efae72772b9a8f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 7 Sep 2022 23:49:32 +0200
Subject: [PATCH 05/14] helper visibility and rename

---
 action.php          |  2 +-
 helper.php          | 76 ++++++++++++++++++++++-----------------------
 syntax/task.php     | 44 +++++++++++++-------------
 syntax/taskform.php |  6 ++--
 syntax/tasks.php    | 26 ++++++++--------
 5 files changed, 77 insertions(+), 77 deletions(-)

diff --git a/action.php b/action.php
index f851d2d..f38938b 100644
--- a/action.php
+++ b/action.php
@@ -169,7 +169,7 @@ function _changeTask() {
             return 'show';
         }
 
-        $responsible = $my->_isResponsible($task['user']['name']);
+        $responsible = $my->isResponsible($task['user']['name']);
 
         // some additional checks if change not performed by an admin
         // FIXME error messages?
diff --git a/helper.php b/helper.php
index dec5e27..835f459 100644
--- a/helper.php
+++ b/helper.php
@@ -9,7 +9,7 @@
 
 class helper_plugin_task extends DokuWiki_Plugin {
 
-    function getMethods() {
+    public function getMethods() {
         $result = [];
         $result[] = [
                 'name'   => 'th',
@@ -59,7 +59,7 @@ function getMethods() {
      *
      * @return string header text, escaped by Pagelist
      */
-    function th() {
+    public function th() {
         return $this->getLang('status');
     }
 
@@ -72,7 +72,7 @@ function th() {
      * @param string $id page id of row
      * @return string html with escaped values
      */
-    function td($id) {
+    public function td($id) {
         $task = $this->readTask($id);
         return $this->statusLabel($task['status']);
     }
@@ -80,7 +80,7 @@ function td($id) {
     /**
      * Returns an array of task pages, sorted by priority
      */
-    function getTasks($ns, $num = null, $filter = '', $user = null) {
+    public function getTasks($ns, $num = null, $filter = '', $user = null) {
         global $conf;
 
         if (!$filter) {
@@ -104,7 +104,7 @@ function getTasks($ns, $num = null, $filter = '', $user = null) {
             if (!$task = $this->readTask($id)) continue;
 
             $date = $task['date']['due'];
-            $responsible = $this->_isResponsible($task['user']);
+            $responsible = $this->isResponsible($task['user']);
 
             // Check status in detail if filter is not 'all'
             if ($filter != 'all') {
@@ -168,7 +168,7 @@ function getTasks($ns, $num = null, $filter = '', $user = null) {
     /**
      * Reads the .task metafile
      */
-    function readTask($id) {
+    public function readTask($id) {
         $file = metaFN($id, '.task');
         if (!@file_exists($file)) {
             $data = p_get_metadata($id, 'task');
@@ -194,7 +194,7 @@ function readTask($id) {
     /**
      * Saves the .task metafile
      */
-    function writeTask($id, $data) {
+    public function writeTask($id, $data) {
         if (!is_array($data)) {
             return false;
         }
@@ -226,7 +226,7 @@ function writeTask($id, $data) {
         }
 
         // generate vtodo for iCal file download
-        $data['vtodo'] = $this->_vtodo($id, $data);
+        $data['vtodo'] = $this->vtodo($id, $data);
 
         // generate sortkey with priority and creation date
         $data['key'] = chr($data['priority'] + 97).(2000000000 - $data['date']['created']);
@@ -235,14 +235,14 @@ function writeTask($id, $data) {
         $ok = io_saveFile($file, serialize($data));
 
         // and finally notify users
-        $this->_notify($data);
+        $this->notify($data);
         return $ok;
     }
 
     /**
      * Returns the label of a status
      */
-    function statusLabel($status) {
+    public function statusLabel($status) {
         switch ($status) {
             case -1:
                 return $this->getLang('rejected');
@@ -262,7 +262,7 @@ function statusLabel($status) {
     /**
      * Returns the label of a priority
      */
-    function priorityLabel($priority) {
+    public function priorityLabel($priority) {
         switch ($priority) {
             case 1:
                 return $this->getLang('medium');
@@ -278,7 +278,7 @@ function priorityLabel($priority) {
     /**
      * Is the given task assigned to the current user?
      */
-    function _isResponsible($user) {
+    public function isResponsible($user) {
         global $INFO, $INPUT;
 
         if (!$user) {
@@ -299,7 +299,7 @@ function _isResponsible($user) {
     /**
      * Interpret date with strtotime()
      */
-    function _interpretDate($str) {
+    public function interpretDate($str) {
         if (!$str) {
             return null;
         }
@@ -339,7 +339,7 @@ function _interpretDate($str) {
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author Esther Brunner <wikidesign@gmail.com>
      */
-    function _notify($task) {
+    protected function notify($task) {
         global $conf;
         global $ID;
 
@@ -383,7 +383,7 @@ function _notify($task) {
     /**
      * Generates a VTODO section for iCal file download
      */
-    function _vtodo($id, $task) {
+    protected function vtodo($id, $task) {
         if (!defined('CRLF')) define('CRLF', "\r\n");
 
         $meta = p_get_metadata($id);
@@ -391,34 +391,34 @@ function _vtodo($id, $task) {
         $ret = 'BEGIN:VTODO'.CRLF.
             'UID:'.$id.'@'.$_SERVER['SERVER_NAME'].CRLF.
             'URL:'.wl($id, '', true, '&').CRLF.
-            'SUMMARY:'.$this->_vsc($meta['title']).CRLF;
+            'SUMMARY:'.$this->vsc($meta['title']).CRLF;
         if ($meta['description']['abstract']) {
-            $ret .= 'DESCRIPTION:' . $this->_vsc($meta['description']['abstract']) . CRLF;
+            $ret .= 'DESCRIPTION:' . $this->vsc($meta['description']['abstract']) . CRLF;
         }
         if ($meta['subject']) {
-            $ret .= 'CATEGORIES:' . $this->_vcategories($meta['subject']) . CRLF;
+            $ret .= 'CATEGORIES:' . $this->vcategories($meta['subject']) . CRLF;
         }
         if ($task['date']['created']) {
-            $ret .= 'CREATED:' . $this->_vdate($task['date']['created']) . CRLF;
+            $ret .= 'CREATED:' . $this->vdate($task['date']['created']) . CRLF;
         }
         if ($task['date']['modified']) {
-            $ret .= 'LAST-MODIFIED:' . $this->_vdate($task['date']['modified']) . CRLF;
+            $ret .= 'LAST-MODIFIED:' . $this->vdate($task['date']['modified']) . CRLF;
         }
         if ($task['date']['due']) {
-            $ret .= 'DUE:' . $this->_vdate($task['date']['due']) . CRLF;
+            $ret .= 'DUE:' . $this->vdate($task['date']['due']) . CRLF;
         }
         if ($task['date']['completed']) {
-            $ret .= 'COMPLETED:' . $this->_vdate($task['date']['completed']) . CRLF;
+            $ret .= 'COMPLETED:' . $this->vdate($task['date']['completed']) . CRLF;
         }
         if ($task['user']) {
-            $ret .= 'ORGANIZER;CN="' . $this->_vsc($task['user']['name']) . '":' .
+            $ret .= 'ORGANIZER;CN="' . $this->vsc($task['user']['name']) . '":' .
                 'MAILTO:' . $task['user']['mail'] . CRLF;
         }
-        $ret .= 'STATUS:'.$this->_vstatus($task['status']).CRLF;
+        $ret .= 'STATUS:'.$this->vstatus($task['status']).CRLF;
         if (is_numeric($task['priority'])) {
             $ret .= 'PRIORITY:' . (7 - ($task['priority'] * 2)) . CRLF;
         }
-        $ret .= 'CLASS:'.$this->_vclass($id).CRLF.
+        $ret .= 'CLASS:'.$this->vclass($id).CRLF.
             'END:VTODO'.CRLF;
         return $ret;
     }
@@ -426,7 +426,7 @@ function _vtodo($id, $task) {
     /**
      * Encodes vCard / iCal special characters
      */
-    function _vsc($string) {
+    protected function vsc($string) {
         $search = ["\\", ",", ";", "\n", "\r"];
         $replace = ["\\\\", "\\,", "\\;", "\\n", "\\n"];
         return str_replace($search, $replace, $string);
@@ -435,7 +435,7 @@ function _vsc($string) {
     /**
      * Generates YYYYMMDD"T"hhmmss"Z" UTC time date format (ISO 8601 / RFC 3339)
      */
-    function _vdate($date, $extended = false) {
+    protected function vdate($date, $extended = false) {
         if ($extended) {
             return strftime('%Y-%m-%dT%H:%M:%SZ', $date);
         } else {
@@ -446,7 +446,7 @@ function _vdate($date, $extended = false) {
     /**
      * Returns VTODO status
      */
-    function _vstatus($status) {
+    protected function vstatus($status) {
         switch ($status) {
             case -1:
                 return 'CANCELLED';
@@ -464,17 +464,17 @@ function _vstatus($status) {
     /**
      * Returns VTODO categories
      */
-    function _vcategories($cat) {
+    protected function vcategories($cat) {
         if (!is_array($cat)) {
             $cat = explode(' ', $cat);
         }
-        return join(',', $this->_vsc($cat));
+        return join(',', $this->vsc($cat));
     }
 
     /**
      * Returns access classification for VTODO
      */
-    function _vclass($id) {
+    protected function vclass($id) {
         if (auth_quickaclcheck($id) >= AUTH_READ) {
             return 'PUBLIC';
         } else {
@@ -494,11 +494,11 @@ function _vclass($id) {
      *                                for the user field will only show users who are members of
      *                                the user group given in $selectUserGroup.
      */
-    function _newTaskForm($ns, $selectUser=false, $selectUserGroup=null) {
+    public function newTaskForm($ns, $selectUser=false, $selectUserGroup=null) {
         if (class_exists('dokuwiki\Form\Form')) {
-            return $this->_newTaskFormNew($ns, $selectUser, $selectUserGroup);
+            return $this->newTaskFormNew($ns, $selectUser, $selectUserGroup);
         } else {
-            return $this->_newTaskFormOld($ns, $selectUser, $selectUserGroup);
+            return $this->newTaskFormOld($ns, $selectUser, $selectUserGroup);
         }
     }
 
@@ -506,9 +506,9 @@ function _newTaskForm($ns, $selectUser=false, $selectUserGroup=null) {
      * Show the form to create a new task.
      * This is the new version using class dokuwiki\Form\Form.
      *
-     * @see _newTaskForm
+     * @see newTaskForm
      */
-    protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null) {
+    protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null) {
         global $ID, $lang, $INFO, $auth;
 
         $form = new dokuwiki\Form\Form(['id' => 'task__newtask_form']);
@@ -588,9 +588,9 @@ protected function _newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null
      * Show the form to create a new task.
      * This is the old version, creating all HTML code on its own.
      *
-     * @see _newTaskForm
+     * @see newTaskForm
      */
-    protected function _newTaskFormOld($ns, $selectUser=false, $selectUserGroup=null) {
+    protected function newTaskFormOld($ns, $selectUser=false, $selectUserGroup=null) {
         global $ID, $lang, $INFO, $auth;
 
         $ret =  '<div class="newtask_form">';
diff --git a/syntax/task.php b/syntax/task.php
index 5d2f92e..a999164 100644
--- a/syntax/task.php
+++ b/syntax/task.php
@@ -5,7 +5,7 @@
  * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author   Esther Brunner <wikidesign@gmail.com>
  */
- 
+
 class syntax_plugin_task_task extends DokuWiki_Syntax_Plugin {
 
     var $my   = NULL;
@@ -14,34 +14,34 @@ class syntax_plugin_task_task extends DokuWiki_Syntax_Plugin {
     function getType() { return 'substition'; }
     function getSort() { return 305; }
     function getPType() { return 'block';}
-  
+
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('~~TASK.*?~~', $mode, 'plugin_task_task');
     }
-  
+
     function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
         global $INFO;
         global $ACT;
         global $REV;
-     
+
         // strip markup and split arguments
         $match = substr($match, 6, -2);
         $priority = strspn(strstr($match, '!'), '!');
         $match = trim($match, ':!');
         list($user, $date) = explode('?', $match);
-    
+
         if ($my =& plugin_load('helper', 'task')) {
-            $date = $my->_interpretDate($date);
-      
+            $date = $my->interpretDate($date);
+
             $task = array(
                     'user'     => array('name' => $user),
                     'date'     => array('due' => $date),
                     'priority' => $priority
                     );
 
-            // save task meta file if changes were made 
-            // but only for already existing tasks, or when the page is saved 
+            // save task meta file if changes were made
+            // but only for already existing tasks, or when the page is saved
             // $REV prevents overwriting current task information with old revision ones
             if(@file_exists(metaFN($ID, '.task')) && $ACT != 'preview' && !$REV) {
                 $current = $my->readTask($ID);
@@ -53,17 +53,17 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
             }
         }
         return array($user, $date, $priority);
-    }      
- 
-    function render($mode, Doku_Renderer $renderer, $data) {  
+    }
+
+    function render($mode, Doku_Renderer $renderer, $data) {
         global $ID;
 
         list($user, $date, $priority) = $data;
-    
+
         // XHTML output
         if ($mode == 'xhtml') {
             $renderer->nocache();
-      
+
             // prepare data
             $this->_loadHelper();
 
@@ -88,7 +88,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             }
 
             $class .= '"';
-          
+
             // generate output
             $renderer->doc .= '<div class="vcalendar">'.DOKU_LF
                             . '<fieldset'.$class.'>'.DOKU_LF
@@ -106,7 +106,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             } elseif ($task['date']['due']) {
                 $this->_tablerow('date', $this->_hCalDate($task['date']['due']), $renderer, $due);
             }
-    
+
             // show status update form only to logged in users
             if(isset($_SERVER['REMOTE_USER'])) {
                 $this->_tablerow('status', $status, $renderer);
@@ -117,7 +117,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             '</div>'.DOKU_LF;
 
             return true;
-      
+
         // for metadata renderer
         } elseif ($mode == 'metadata') {
             return true;
@@ -125,7 +125,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
 
         return false;
     }
-  
+
     /**
      * Outputs a table row
      */
@@ -140,7 +140,7 @@ function _tablerow($header, $data, &$renderer, $trclass = '', $tdclass = '') {
         $renderer->tablecell_close();
         $renderer->tablerow_close();
     }
-  
+
     /**
      * Loads the helper plugin and gets task data for current ID
      */
@@ -194,7 +194,7 @@ function _statusMenu($options, $status) {
     /**
      * Returns the XHTML for the status popup menu.
      * This is the new version using class dokuwiki\Form\Form.
-     * 
+     *
      * @see _statusMenu
      */
     function _statusMenuNew($options, $status) {
@@ -233,7 +233,7 @@ function _statusMenuNew($options, $status) {
     /**
      * Returns the XHTML for the status popup menu.
      * Old function generating all HTML on its own.
-     * 
+     *
      * @see _statusMenu
      */
     function _statusMenuOld($options, $status) {
@@ -298,4 +298,4 @@ function _hCalDate($date) {
         return '<abbr class="due" title="'.$this->my->_vdate($date, true).'">' . strftime($onlydate, $date) . '</abbr>';
     }
 }
-// vim:ts=4:sw=4:et:enc=utf-8: 
+// vim:ts=4:sw=4:et:enc=utf-8:
diff --git a/syntax/taskform.php b/syntax/taskform.php
index dc790a7..d3eb948 100644
--- a/syntax/taskform.php
+++ b/syntax/taskform.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Task Plugin, task form component: show new task form (only)
- * 
+ *
  * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author   LarsDW223
  */
@@ -19,7 +19,7 @@ public function __construct() {
     function getType() { return 'substition'; }
     function getPType() { return 'block'; }
     function getSort() { return 306; }
-  
+
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('\{\{task>form>.+?\}\}', $mode, 'plugin_task_taskform');
     }
@@ -54,7 +54,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
         list($ns, $flags, $selectUserGroup) = $data;
 
         $selectUser = in_array('selectUser', $flags);
-        if ($this->helper) $renderer->doc .= $this->helper->_newTaskForm($ns, $selectUser, $selectUserGroup);
+        if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns, $selectUser, $selectUserGroup);
         return true;
     }
 }
diff --git a/syntax/tasks.php b/syntax/tasks.php
index 4332749..110b291 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Task Plugin, tasks component: lists tasks of a given namespace
- * 
+ *
  * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
  * @author   Esther Brunner <wikidesign@gmail.com>
  */
@@ -19,7 +19,7 @@ public function __construct() {
     function getType() { return 'substition'; }
     function getPType() { return 'block'; }
     function getSort() { return 306; }
-  
+
     function connectTo($mode) {
         $this->Lexer->addSpecialPattern('\{\{tasks>.+?\}\}', $mode, 'plugin_task_tasks');
     }
@@ -71,7 +71,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             if($select) $renderer->doc .= $this->_viewMenu($filter);
             if(auth_quickaclcheck($ns.':*') >= AUTH_CREATE) {
                 if(!in_array('noform', $flags)) {
-                    if ($this->helper) $renderer->doc .= $this->helper->_newTaskForm($ns);
+                    if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
                 }
             }
             return true; // nothing to display
@@ -97,7 +97,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             $perm_create = (auth_quickaclcheck($ns.':*') >= AUTH_CREATE);
             if($perm_create && ($this->getConf('tasks_formposition') == 'top')) {
                 if(!in_array('noform', $flags)) {
-                    if ($this->helper) $renderer->doc .= $this->helper->_newTaskForm($ns);
+                    if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
                 }
             }
 
@@ -108,7 +108,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
                 return false;
             }
 
-            // show view filter popup if not 
+            // show view filter popup if not
             if ($select) $renderer->doc .= $this->_viewMenu($filter);
 
             // prepare pagelist columns
@@ -129,12 +129,12 @@ function render($mode, Doku_Renderer $renderer, $data) {
                 $pagelist->addPage($page);
             }
             $renderer->doc .= $pagelist->finishList();
-            $renderer->doc .= $this->_paginationLinks($numOfPages, $currentPage, $filter);      
+            $renderer->doc .= $this->_paginationLinks($numOfPages, $currentPage, $filter);
 
             // show form to create a new task?
             if($perm_create && ($this->getConf('tasks_formposition') == 'bottom')) {
                 if(!in_array('noform', $flags)) {
-                    if ($this->helper) $renderer->doc .= $this->helper->_newTaskForm($ns);
+                    if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
                 }
             }
 
@@ -150,7 +150,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
         }
         return false;
     }
-  
+
 /* ---------- (X)HTML Output Functions ---------- */
 
     /**
@@ -168,7 +168,7 @@ function _viewMenu($filter) {
     /**
      * Show a popup to select the task view filter.
      * This is the new version using class dokuwiki\Form\Form.
-     * 
+     *
      * @see _viewMenu
      */
     function _viewMenuNew($filter) {
@@ -224,7 +224,7 @@ function _viewMenuNew($filter) {
     /**
      * Show a popup to select the task view filter.
      * Old function generating all HTML on its own.
-     * 
+     *
      * @see _viewMenu
      */
     function _viewMenuOld($filter) {
@@ -261,7 +261,7 @@ function _viewMenuOld($filter) {
 
         return $ret;
     }
-  
+
    /**
     * Returns an array of available view filters for the task list
     */
@@ -274,7 +274,7 @@ function _viewFilters() {
         }
         return $filters;
     }
-  
+
     /**
     * Returns pagination links if more than one page
     */
@@ -295,7 +295,7 @@ function _paginationLinks($num, $cur, $filter) {
                 if(isset($_REQUEST['view_user'])) {
                     $user = array();
                     $user['id'] = $_REQUEST['view_user'];
-                    if($this->helper->_isResponsible($user)) {
+                    if($this->helper->isResponsible($user)) {
                         $opt['view_user'] = $_REQUEST['view_user'];
                     }
                 }

From d57a637b49a885901db0e6a93e5d208aa7d6a53f Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 8 Sep 2022 00:40:33 +0200
Subject: [PATCH 06/14] rename helper

---
 action.php      | 13 +++++++------
 syntax/task.php | 21 +++++++++++----------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/action.php b/action.php
index f38938b..4eba5dc 100644
--- a/action.php
+++ b/action.php
@@ -152,8 +152,9 @@ function _changeTask() {
         }
 
         // load task data
-        if ($my =& plugin_load('helper', 'task')) {
-            $task = $my->readTask($ID);
+        /** @var helper_plugin_task $helper */
+        if ($helper = $this->loadHelper('task', false)) {
+            $task = $helper->readTask($ID);
         } else {
             if ($this->getConf('show_error_msg')) {
                 msg($this->getLang('msg_load_helper_failed'), -1);
@@ -169,7 +170,7 @@ function _changeTask() {
             return 'show';
         }
 
-        $responsible = $my->isResponsible($task['user']['name']);
+        $responsible = $helper->isResponsible($task['user']['name']);
 
         // some additional checks if change not performed by an admin
         // FIXME error messages?
@@ -221,13 +222,13 @@ function _changeTask() {
         // save .task meta file and clear xhtml cache
         $oldstatus = $task['status'];
         $task['status'] = $status;
-        $my->writeTask($ID, $task);
+        $helper->writeTask($ID, $task);
         $_REQUEST['purge'] = true;
 
         if ($this->getConf('show_success_msg')) {
             $message = $this->getLang('msg_status_changed');
-            $message = str_replace('%status%', $my->statusLabel($status), $message);
-            $message = str_replace('%oldstatus%', $my->statusLabel($oldstatus), $message);
+            $message = str_replace('%status%', $helper->statusLabel($status), $message);
+            $message = str_replace('%oldstatus%', $helper->statusLabel($oldstatus), $message);
             msg($message, 1);
         }
 
diff --git a/syntax/task.php b/syntax/task.php
index a999164..e2b6581 100644
--- a/syntax/task.php
+++ b/syntax/task.php
@@ -8,7 +8,7 @@
 
 class syntax_plugin_task_task extends DokuWiki_Syntax_Plugin {
 
-    var $my   = NULL;
+    var $my   = null;
     var $task = array();
 
     function getType() { return 'substition'; }
@@ -31,25 +31,26 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
         $match = trim($match, ':!');
         list($user, $date) = explode('?', $match);
 
-        if ($my =& plugin_load('helper', 'task')) {
-            $date = $my->interpretDate($date);
+        /** @var helper_plugin_task $helper */
+        if ($helper = plugin_load('helper', 'task')) {
+            $date = $helper->interpretDate($date);
 
-            $task = array(
-                    'user'     => array('name' => $user),
-                    'date'     => array('due' => $date),
+            $task = [
+                    'user'     => ['name' => $user],
+                    'date'     => ['due' => $date],
                     'priority' => $priority
-                    );
+            ];
 
             // save task meta file if changes were made
             // but only for already existing tasks, or when the page is saved
             // $REV prevents overwriting current task information with old revision ones
             if(@file_exists(metaFN($ID, '.task')) && $ACT != 'preview' && !$REV) {
-                $current = $my->readTask($ID);
+                $current = $helper->readTask($ID);
                 if (($current['user']['name'] != $user) || ($current['date']['due'] != $date) || ($current['priority'] != $priority)) {
-                    $my->writeTask($ID, $task);
+                    $helper->writeTask($ID, $task);
                 }
             } elseif ($ACT != 'preview' && !$REV) {
-                $my->writeTask($ID, $task);
+                $helper->writeTask($ID, $task);
             }
         }
         return array($user, $date, $priority);

From 30e72cd55681322c426f87c95823831f96741389 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 8 Sep 2022 00:41:35 +0200
Subject: [PATCH 07/14] rename, reformat, remove duplicate file exists

---
 action.php | 44 +++++++++++++++++++++-----------------------
 1 file changed, 21 insertions(+), 23 deletions(-)

diff --git a/action.php b/action.php
index 4eba5dc..023c436 100644
--- a/action.php
+++ b/action.php
@@ -9,19 +9,18 @@ class action_plugin_task extends DokuWiki_Action_Plugin {
     /**
      * register the eventhandlers
      */
-    function register(Doku_Event_Handler $contr) {
-        $contr->register_hook('ACTION_ACT_PREPROCESS',
-                            'BEFORE',
-                            $this,
-                            'handle_act_preprocess',
-                            array());
+    public function register(Doku_Event_Handler $controller) {
+        $controller->register_hook('ACTION_ACT_PREPROCESS', 'BEFORE', $this, 'handleTaskActions', []);
     }
 
     /**
      * Checks if 'newentry' was given as action, if so we
      * do handle the event our self and no further checking takes place
+     *
+     * @param Doku_Event $event
+     * @param $param
      */
-    function handle_act_preprocess(&$event, $param) {
+    public function handleTaskActions($event, $param) {
         if ($event->data != 'newtask' && $event->data != 'changetask') return;
 
         // we can handle it -> prevent others
@@ -29,10 +28,10 @@ function handle_act_preprocess(&$event, $param) {
 
         switch($event->data) {
             case 'newtask':
-                $event->data = $this->_newTask();
+                $event->data = $this->newTask();
                 break;
             case 'changetask':
-                $event->data = $this->_changeTask();
+                $event->data = $this->changeTask();
                 break;
         }
     }
@@ -40,7 +39,7 @@ function handle_act_preprocess(&$event, $param) {
     /**
      * Creates a new task page
      */
-    function _newTask() {
+    protected function newTask() {
         global $ID;
         global $INFO;
 
@@ -53,7 +52,7 @@ function _newTask() {
         // check if we are allowed to create this file
         if ($INFO['perm'] >= AUTH_CREATE) {
 
-            //check if locked by anyone - if not lock for my self      
+            //check if locked by anyone - if not lock for my self
             if ($INFO['locked']) {
                 return 'locked';
             } else {
@@ -88,7 +87,7 @@ function _newTask() {
             return 'show';
         }
     }
-  
+
     /**
      * Adapted version of pageTemplate() function
      */
@@ -99,7 +98,7 @@ function _pageTemplate($data) {
         $tpl  = io_readFile(DOKU_PLUGIN.'task/_template.txt');
 
         // standard replacements
-        $replace = array(
+        $replace = [
                 '@ID@'   => $id,
                 '@NS@'   => $data['ns'],
                 '@PAGE@' => strtr(noNS($id),'_',' '),
@@ -107,7 +106,7 @@ function _pageTemplate($data) {
                 '@NAME@' => $INFO['userinfo']['name'],
                 '@MAIL@' => $INFO['userinfo']['mail'],
                 '@DATE@' => $data['date'],
-                );
+        ];
 
         // additional replacements
         $replace['@BACK@']     = $data['back'];
@@ -115,14 +114,14 @@ function _pageTemplate($data) {
         $replace['@PRIORITY@'] = $data['priority'];
 
         // tag if tag plugin is available
-        if ((@file_exists(DOKU_PLUGIN.'tag/syntax/tag.php')) && (!plugin_isdisabled('tag'))) {
+        if (!plugin_isdisabled('tag')) {
             $replace['@TAG@'] = "\n\n{{tag>}}";
         } else {
             $replace['@TAG@'] = '';
         }
 
         // discussion if discussion plugin is available
-        if ((@file_exists(DOKU_PLUGIN.'discussion/syntax/comments.php')) && (!plugin_isdisabled('discussion'))) {
+        if (!plugin_isdisabled('discussion')) {
             $replace['@DISCUSSION@'] = "~~DISCUSSION~~";
         } else {
             $replace['@DISCUSSION@'] = '';
@@ -132,17 +131,17 @@ function _pageTemplate($data) {
         $tpl = str_replace(array_keys($replace), array_values($replace), $tpl);
         return $tpl;
     }
-  
+
     /**
      * Changes the status of a task
      */
-    function _changeTask() {
+    protected function changeTask() {
         global $ID;
         global $INFO;
 
         $status = $_REQUEST['status'];
         $status = trim($status);
-        if (!is_numeric($status) || ($status < -1) || ($status > 4)) {
+        if (!is_numeric($status) || $status < -1 || $status > 4) {
             if ($this->getConf('show_error_msg')) {
                 $message = $this->getLang('msg_rcvd_invalid_status');
                 $message = str_replace('%status%', $status, $message);
@@ -177,7 +176,7 @@ function _changeTask() {
         if ($INFO['perm'] != AUTH_ADMIN) {
 
             // responsible person can't verify her / his own tasks
-            if ($responsible && ($status == 4)) {
+            if ($responsible && $status == 4) {
                 if ($this->getConf('show_info_msg')) {
                     msg ($this->getLang('msg_responsible_no_verify'));
                 }
@@ -212,11 +211,11 @@ function _changeTask() {
                 saveWikiText($ID, $new, $summary, true); // save as minor edit
             }
 
-            $task['user'] = array(
+            $task['user'] = [
                     'id'   => $_SERVER['REMOTE_USER'],
                     'name' => $INFO['userinfo']['name'],
                     'mail' => $INFO['userinfo']['mail'],
-                    );
+            ];
         }
 
         // save .task meta file and clear xhtml cache
@@ -235,4 +234,3 @@ function _changeTask() {
         return 'show';
     }
 }
-// vim:ts=4:sw=4:et:enc=utf-8:

From 624860fcc1b9f800dcd34c925d2c98178a4f704a Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 13 Sep 2022 21:10:05 +0200
Subject: [PATCH 08/14] fix typo

---
 syntax/tasks.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/syntax/tasks.php b/syntax/tasks.php
index 110b291..ffaad39 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -291,7 +291,7 @@ function _paginationLinks($num, $cur, $filter) {
             } else {
                 $opt = array();
                 $opt['first']  = $perpage * ($i - 1);
-                $opt['filter'] = $filer;
+                $opt['filter'] = $filter;
                 if(isset($_REQUEST['view_user'])) {
                     $user = array();
                     $user['id'] = $_REQUEST['view_user'];

From 631d58328d11fe26ac22972ec003aa08fbd839cf Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 13 Sep 2022 21:13:20 +0200
Subject: [PATCH 09/14] fix php8 warnings

---
 syntax/taskform.php | 2 +-
 syntax/tasks.php    | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/syntax/taskform.php b/syntax/taskform.php
index d3eb948..6dabd2d 100644
--- a/syntax/taskform.php
+++ b/syntax/taskform.php
@@ -29,7 +29,7 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
 
         // strip {{task>form> from start and }} from end
         $match = substr($match, 12, -2);
-        list($ns, $flags) = explode('&', $match, 2);
+        list($ns, $flags) = array_pad(explode('&', $match, 2), 2,'');
         $flags = explode('&', $flags);
 
         if (($ns == '*') || ($ns == ':')) $ns = '';
diff --git a/syntax/tasks.php b/syntax/tasks.php
index ffaad39..e0b4265 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -28,10 +28,10 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
 
         $match = substr($match, 8, -2); // strip {{topic> from start and }} from end
-        list($match, $flags) = explode('&', $match, 2);
+        list($match, $flags) = array_pad(explode('&', $match, 2),2,'');
         $flags = explode('&', $flags);
-        list($match, $refine) = explode(' ', $match, 2);
-        list($ns, $filter) = explode('?', $match, 2);
+        list($match, $refine) = array_pad(explode(' ', $match, 2),2,'');
+        list($ns, $filter) = array_pad(explode('?', $match, 2),2,'');
 
         if (($ns == '*') || ($ns == ':')) $ns = '';
         elseif ($ns == '.') $ns = getNS($ID);

From 3b51d96983d74047d85443a3e8a2a07afb00455b Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 13 Sep 2022 21:14:25 +0200
Subject: [PATCH 10/14] ics.php: cleanup duplicated requires, little
 refactoring

---
 ics.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/ics.php b/ics.php
index 01033df..baf9643 100644
--- a/ics.php
+++ b/ics.php
@@ -7,21 +7,20 @@
 if(!defined('DOKU_INC')) define('DOKU_INC', realpath(dirname(__FILE__)).'/../../../');
 
 require_once(DOKU_INC.'inc/init.php');
-require_once(DOKU_INC.'inc/common.php');
-require_once(DOKU_INC.'inc/infoutils.php');
-require_once(DOKU_INC.'inc/pageutils.php');
-require_once(DOKU_INC.'inc/parserutils.php');
 
-$id = $_REQUEST['id'];
+global $INPUT;
+$id = cleanID($INPUT->str('id'));
 
 $data = unserialize(io_readFile(metaFN($id, '.task'), false));
-if (!$data['vtodo']) msg('No VTODO data for this task.', -1);
+if (!$data['vtodo']) {
+    msg('No VTODO data for this task.', -1);
+}
 
 $title = p_get_metadata($id, 'title');
 if($title) {
     $filename = $title . '.ics';
 } else {
-    $filename = str_replace(':', '/', cleanID($id)) . '.ics';
+    $filename = str_replace(':', '/', $id) . '.ics';
 }
 
 $output = 'BEGIN:VCALENDAR'.CRLF.
@@ -36,5 +35,3 @@
 header("Content-Type: text/Calendar; name='$filename'");
 
 echo $output;
-
-// vim:ts=4:sw=4:et:enc=utf-8:

From f8cf87e94493ab4513429a9f32dfaef58f99ec7e Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Tue, 13 Sep 2022 23:58:04 +0200
Subject: [PATCH 11/14] reformatting, phpdocs, renaming, visibility, removed
 unused vars

---
 helper.php          | 107 +++++++++++++++++++++++++++++++--
 syntax/task.php     | 138 ++++++++++++++++++++++++------------------
 syntax/taskform.php |  40 ++++++++-----
 syntax/tasks.php    | 143 ++++++++++++++++++++++++++++----------------
 4 files changed, 298 insertions(+), 130 deletions(-)

diff --git a/helper.php b/helper.php
index 835f459..f474f08 100644
--- a/helper.php
+++ b/helper.php
@@ -79,6 +79,22 @@ public function td($id) {
 
     /**
      * Returns an array of task pages, sorted by priority
+     *
+     * @param string $ns only tasks from this namespace including its subnamespaces
+     * @param int|null $num max number of returned rows, null is all
+     * @param string $filter 'all', 'rejected', 'accepted', 'started', 'done', 'verified', 'my', 'new', 'due', 'overdue'
+     * @param string $user show task of given user FIXME not used??
+     * @return array with the rows:
+     *  string sortkey => [
+     *      'id'       => string page id,
+     *      'date'     => int timestamp of due date,
+     *      'user'     => string name of user,
+     *      'status'   => string translated status
+     *      'priority' => int in range 0 to 4
+     *      'perm'     => int ACL permission
+     *      'file'     => string .task metadata file
+     *      'exists'   => true
+     * ]
      */
     public function getTasks($ns, $num = null, $filter = '', $user = null) {
         global $conf;
@@ -167,10 +183,30 @@ public function getTasks($ns, $num = null, $filter = '', $user = null) {
 
     /**
      * Reads the .task metafile
+     *
+     * @param string $id page id
+     * @return array|false returns data array, otherwise false,
+     *  with:
+     *   'date' => [
+     *      'created' => int,
+     *      'modified' => int,
+     *      'due' => int,
+     *      'completed' => int
+     *   ],
+     *   'user' => [
+     *      'name' => ...
+     *   ],
+     *   'file' => string,
+     *   'exists' => bool
+     *   'status' => int,
+     *   'priority' => string
+     *   'vtodo' => string vtodo for iCal file download,
+     *   'key' => string sortkey based at priority and creation date
      */
     public function readTask($id) {
         $file = metaFN($id, '.task');
         if (!@file_exists($file)) {
+            //old format? reset stored metadata and replace by .task metadata file
             $data = p_get_metadata($id, 'task');
             if (is_array($data)) {
                 $data['date'] = ['due' => $data['date']];
@@ -192,7 +228,29 @@ public function readTask($id) {
     }
 
     /**
-     * Saves the .task metafile
+     * Saves provided data to the .task metafile
+     *
+     * @param string $id page id
+     * @param array $data with at least:
+     *   'file' => string,
+     *   'exists' => bool,
+     *   'date' => [
+     *       'created' => int,
+     *       'modified' => int,
+     *       'due' => int,
+     *       'completed' => int
+     *    ] or string due date (old?),
+     *   'user' => [
+     *       'name' string
+     *   ] or string name (old?),
+     *   'status' => int,
+     *   'priority' => string
+     *
+     *  key created before storing:
+     *   'vtodo' => string vtodo for iCal file download,
+     *   'key' => string sortkey based at priority and creation date
+     *
+     * @return bool success?
      */
     public function writeTask($id, $data) {
         if (!is_array($data)) {
@@ -206,6 +264,7 @@ public function writeTask($id, $data) {
 
         // set creation or modification time
         if (!is_array($data['date'])) {
+            //old format?
             $data['date'] = ['due' => $data['date']];
         }
         if (!@file_exists($file) || !$data['date']['created']) {
@@ -215,12 +274,13 @@ public function writeTask($id, $data) {
         }
 
         if (!is_array($data['user'])) {
+            //old format?
             $data['user'] = ['name' => $data['user']];
         }
 
         if (!isset($data['status'])) {    // make sure we don't overwrite status
-            $current = unserialize(io_readFile($file, false));
-            $data['status'] = $current['status'];
+            $currentTask = unserialize(io_readFile($file, false));
+            $data['status'] = $currentTask['status'];
         } elseif ($data['status'] == 3) { // set task completion time
             $data['date']['completed'] = time();
         }
@@ -241,6 +301,9 @@ public function writeTask($id, $data) {
 
     /**
      * Returns the label of a status
+     *
+     * @param int $status
+     * @return string
      */
     public function statusLabel($status) {
         switch ($status) {
@@ -261,6 +324,9 @@ public function statusLabel($status) {
 
     /**
      * Returns the label of a priority
+     *
+     * @param int $priority
+     * @return string
      */
     public function priorityLabel($priority) {
         switch ($priority) {
@@ -276,7 +342,13 @@ public function priorityLabel($priority) {
     }
 
     /**
-     * Is the given task assigned to the current user?
+     * Is the given task user assigned to the current logged-in user?
+     *
+     * @param string|array $user string name of user, or array with:
+     *  'id' => string,
+     *  'name' => string
+     *
+     * @return bool
      */
     public function isResponsible($user) {
         global $INFO, $INPUT;
@@ -288,7 +360,7 @@ public function isResponsible($user) {
         if (
             isset($user['id']) && $user['id'] == $INPUT->server->str('REMOTE_USER')
             || isset($user['name']) && $user['name'] == $INFO['userinfo']['name']
-            || $user == $INFO['userinfo']['name']
+            || $user == $INFO['userinfo']['name'] //was old format?
         ) {
             return true;
         }
@@ -298,6 +370,9 @@ public function isResponsible($user) {
 
     /**
      * Interpret date with strtotime()
+     *
+     * @param string $str
+     * @return false|int|null timestamp or null
      */
     public function interpretDate($str) {
         if (!$str) {
@@ -334,7 +409,7 @@ public function interpretDate($str) {
     /**
      * Sends a notify mail on new or changed task
      *
-     * @param  array  $task  data array of the task
+     * @param array $task data array of the task
      *
      * @author Andreas Gohr <andi@splitbrain.org>
      * @author Esther Brunner <wikidesign@gmail.com>
@@ -382,6 +457,10 @@ protected function notify($task) {
 
     /**
      * Generates a VTODO section for iCal file download
+     *
+     * @param string $id page id
+     * @param array $task data array of the task
+     * @return string
      */
     protected function vtodo($id, $task) {
         if (!defined('CRLF')) define('CRLF', "\r\n");
@@ -425,6 +504,9 @@ protected function vtodo($id, $task) {
 
     /**
      * Encodes vCard / iCal special characters
+     *
+     * @param string|array $string
+     * @return array|string|string[]
      */
     protected function vsc($string) {
         $search = ["\\", ",", ";", "\n", "\r"];
@@ -434,6 +516,10 @@ protected function vsc($string) {
 
     /**
      * Generates YYYYMMDD"T"hhmmss"Z" UTC time date format (ISO 8601 / RFC 3339)
+     *
+     * @param int $date timestamp
+     * @param bool $extended other date format
+     * @return false|string
      */
     protected function vdate($date, $extended = false) {
         if ($extended) {
@@ -445,6 +531,9 @@ protected function vdate($date, $extended = false) {
 
     /**
      * Returns VTODO status
+     *
+     * @param int $status
+     * @return string
      */
     protected function vstatus($status) {
         switch ($status) {
@@ -463,6 +552,9 @@ protected function vstatus($status) {
 
     /**
      * Returns VTODO categories
+     *
+     * @param string|array $cat
+     * @return string
      */
     protected function vcategories($cat) {
         if (!is_array($cat)) {
@@ -473,6 +565,9 @@ protected function vcategories($cat) {
 
     /**
      * Returns access classification for VTODO
+     *
+     * @param string $id page id
+     * @return string
      */
     protected function vclass($id) {
         if (auth_quickaclcheck($id) >= AUTH_READ) {
diff --git a/syntax/task.php b/syntax/task.php
index e2b6581..8b83259 100644
--- a/syntax/task.php
+++ b/syntax/task.php
@@ -8,20 +8,19 @@
 
 class syntax_plugin_task_task extends DokuWiki_Syntax_Plugin {
 
-    var $my   = null;
-    var $task = array();
+    protected $helper = null;
+    protected $task = [];
 
-    function getType() { return 'substition'; }
-    function getSort() { return 305; }
-    function getPType() { return 'block';}
+    public function getType() { return 'substition'; }
+    public function getSort() { return 305; }
+    public function getPType() { return 'block';}
 
-    function connectTo($mode) {
+    public function connectTo($mode) {
         $this->Lexer->addSpecialPattern('~~TASK.*?~~', $mode, 'plugin_task_task');
     }
 
-    function handle($match, $state, $pos, Doku_Handler $handler) {
+    public function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
-        global $INFO;
         global $ACT;
         global $REV;
 
@@ -46,43 +45,50 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
             // $REV prevents overwriting current task information with old revision ones
             if(@file_exists(metaFN($ID, '.task')) && $ACT != 'preview' && !$REV) {
                 $current = $helper->readTask($ID);
-                if (($current['user']['name'] != $user) || ($current['date']['due'] != $date) || ($current['priority'] != $priority)) {
+                if ($current['user']['name'] != $user || $current['date']['due'] != $date || $current['priority'] != $priority) {
                     $helper->writeTask($ID, $task);
                 }
             } elseif ($ACT != 'preview' && !$REV) {
                 $helper->writeTask($ID, $task);
             }
         }
-        return array($user, $date, $priority);
+        return [$user, $date, $priority];
     }
 
-    function render($mode, Doku_Renderer $renderer, $data) {
+    public function render($format, Doku_Renderer $renderer, $data) {
         global $ID;
 
         list($user, $date, $priority) = $data;
 
         // XHTML output
-        if ($mode == 'xhtml') {
+        if ($format == 'xhtml') {
+            /** @var Doku_Renderer_xhtml $renderer */
             $renderer->nocache();
 
             // prepare data
             $this->_loadHelper();
 
-            $task = array();
+            $task = [];
             if(@file_exists(metaFN($ID, '.task'))) {
-                $task = $this->my->readTask($ID);
+                $task = $this->helper->readTask($ID);
             }
 
             $status = $this->_getStatus($user, $sn);
             $due = '';
 
-            if ($date && ($sn < 3)) {
-                if ($date + 86400 < time()) $due = 'overdue';
-                elseif ($date < time()) $due = 'due';
+            if ($date && $sn < 3) {
+                if ($date + 86400 < time()) {
+                    $due = 'overdue';
+                }
+                elseif ($date < time()) {
+                    $due = 'due';
+                }
             }
 
             $class = ' class="vtodo';
-            if ($priority) $class .= ' priority' . $priority;
+            if ($priority) {
+                $class .= ' priority' . $priority;
+            }
             if ($due) {
                 $class .= ' '.$due;
                 $due = ' class="'.$due.'"';
@@ -91,10 +97,10 @@ function render($mode, Doku_Renderer $renderer, $data) {
             $class .= '"';
 
             // generate output
-            $renderer->doc .= '<div class="vcalendar">'.DOKU_LF
-                            . '<fieldset'.$class.'>'.DOKU_LF
-                            . '<legend>'.$this->_icsDownload().$this->getLang('task').'</legend>'.DOKU_LF
-                            . '<table class="blind">'.DOKU_LF;
+            $renderer->doc .= '<div class="vcalendar">'
+                            . '<fieldset'.$class.'>'
+                            . '<legend>'.$this->_icsDownload().$this->getLang('task').'</legend>'
+                            . '<table class="blind">';
 
             if ($user) {
                 $this->_tablerow('user', $this->_hCalUser($user), $renderer, '', 'organizer');
@@ -120,7 +126,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
             return true;
 
         // for metadata renderer
-        } elseif ($mode == 'metadata') {
+        } elseif ($format == 'metadata') {
             return true;
         }
 
@@ -129,13 +135,23 @@ function render($mode, Doku_Renderer $renderer, $data) {
 
     /**
      * Outputs a table row
+     *
+     * @param string $header id of header translation string
+     * @param string $data content of table cell
+     * @param Doku_Renderer_xhtml $renderer
+     * @param string $trclass class of row
+     * @param string $tdclass class of cell
      */
-    function _tablerow($header, $data, &$renderer, $trclass = '', $tdclass = '') {
-        if ($tdclass) $tdclass = ' class="'.$tdclass.'"';
+    protected function _tablerow($header, $data, $renderer, $trclass = '', $tdclass = '') {
+        if ($tdclass) {
+            $tdclass = ' class="'.$tdclass.'"';
+        }
 
-        $renderer->doc .= '<tr'.$trclass.'>'.DOKU_LF;
+        $renderer->doc .= '<tr'.$trclass.'>';
         $renderer->tableheader_open(1, '');
-        if ($header) $renderer->doc .= hsc($this->getLang($header)).':';
+        if ($header) {
+            $renderer->doc .= hsc($this->getLang($header)).':';
+        }
         $renderer->tableheader_close();
         $renderer->doc .= '<td'.$tdclass.'>'.$data;
         $renderer->tablecell_close();
@@ -145,46 +161,52 @@ function _tablerow($header, $data, &$renderer, $trclass = '', $tdclass = '') {
     /**
      * Loads the helper plugin and gets task data for current ID
      */
-    function _loadHelper() {
+    protected function _loadHelper() {
         global $ID;
-        $this->my =& plugin_load('helper', 'task');
-        if (!is_object($this->my)) return false;
-        $this->task = $this->my->readTask($ID);
-        return $true;
+        $this->helper = plugin_load('helper', 'task');
+        if (!is_object($this->helper)) {
+            return false;
+        }
+        $this->task = $this->helper->readTask($ID);
+        return true;
     }
 
     /**
      * Returns the status cell contents
      */
-    function _getStatus($user, &$status) {
+    protected function _getStatus($user, &$status) {
         global $INFO;
 
         $ret = '';
         $status = $this->task['status'];
-        $responsible = $this->my->_isResponsible($user);
+        $responsible = $this->helper->_isResponsible($user);
 
         if ($INFO['perm'] == AUTH_ADMIN) {
-            $ret = $this->_statusMenu(array(-1, 0, 1, 2, 3, 4), $status);
+            $ret = $this->_statusMenu([-1, 0, 1, 2, 3, 4], $status);
         } elseif ($responsible) {
-            if ($status < 3) $ret = $this->_statusMenu(array(-1, 0, 1, 2, 3), $status);
+            if ($status < 3) {
+                $ret = $this->_statusMenu([-1, 0, 1, 2, 3], $status);
+            }
         } else {
             if ($status == 0) {
-                $ret = $this->_statusMenu(array(0, 1), $status);
+                $ret = $this->_statusMenu([0, 1], $status);
             } elseif ($status == 3) {
-                $ret = $this->_statusMenu(array(2, 3, 4), $status);
+                $ret = $this->_statusMenu([2, 3, 4], $status);
             }
         }
 
-        if (!$ret && $this->my) $ret = $this->my->statusLabel($status);
+        if (!$ret && $this->helper) {
+            $ret = $this->helper->statusLabel($status);
+        }
 
-        return '<abbr class="status" title="'.$this->my->_vstatus($status).'">'. $ret .'</abbr>';
+        return '<abbr class="status" title="'.$this->helper->_vstatus($status).'">'. $ret .'</abbr>';
     }
 
     /**
      * Returns the XHTML for the status drop down list.
      * Just forwards call to the old or new function.
      */
-    function _statusMenu($options, $status) {
+    protected function _statusMenu($options, $status) {
         if (class_exists('dokuwiki\Form\Form')) {
             return $this->_statusMenuNew($options, $status);
         } else {
@@ -198,8 +220,8 @@ function _statusMenu($options, $status) {
      *
      * @see _statusMenu
      */
-    function _statusMenuNew($options, $status) {
-        global $ID, $lang;
+    protected function _statusMenuNew($options, $status) {
+        global $ID;
 
         $form = new dokuwiki\Form\Form(array('id' => 'task__changetask_form'));
         $pos = 1;
@@ -211,20 +233,19 @@ function _statusMenuNew($options, $status) {
         $form->setHiddenField ('do', 'changetask');
 
         // Select status from drop down list
-        $dropDownOptions = array();
-        $selected = NULL;
-        $value = 0;
+        $dropDownOptions = [];
+        $selected = null;
         foreach ($options as $option) {
             if ($status == $option) {
                 $selected = $option.' ';
             }
-            $dropDownOptions [$option.' '] = $this->my->statusLabel($option);
+            $dropDownOptions [$option.' '] = $this->helper->statusLabel($option);
         }
-        $input = $form->addDropdown('status', $dropDownOptions, NULL, $pos++);
+        $input = $form->addDropdown('status', $dropDownOptions, null, $pos++);
         $input->val($selected);
 
         // Add button
-        $form->addButton(NULL, $this->getLang('btn_change'), $pos++);
+        $form->addButton(null, $this->getLang('btn_change'), $pos++);
 
         $form->addHTML('</div>', $pos++);
 
@@ -237,7 +258,7 @@ function _statusMenuNew($options, $status) {
      *
      * @see _statusMenu
      */
-    function _statusMenuOld($options, $status) {
+    protected function _statusMenuOld($options, $status) {
         global $ID;
         global $lang;
 
@@ -249,8 +270,10 @@ function _statusMenuOld($options, $status) {
 
         foreach ($options as $option) {
             $ret .= '<option value="'.$option.'"';
-            if ($status == $option) $ret .= ' selected="selected"';
-            $ret .= '>'.$this->my->statusLabel($option).'</option>';
+            if ($status == $option) {
+                $ret .= ' selected="selected"';
+            }
+            $ret .= '>'.$this->helper->statusLabel($option).'</option>';
         }
 
         $ret .= '</select>';
@@ -264,7 +287,7 @@ function _statusMenuOld($options, $status) {
     /**
      * Returns the download link for the iCal file
      */
-    function _icsDownload() {
+    protected function _icsDownload() {
         global $ID;
         global $INFO;
 
@@ -283,20 +306,19 @@ function _icsDownload() {
     /**
      * Returns the organizer in hCalendar format as hCard
      */
-    function _hCalUser($user) {
+    protected function _hCalUser($user) {
         return '<span class="vcard"><span class="fn">' . hsc($user) . '</span></span>';
     }
 
     /**
      * Returns the date in hCalendar format
      */
-    function _hCalDate($date) {
+    protected function _hCalDate($date) {
         global $conf;
 
         // strip time from preferred date format
-        $onlydate = preg_replace('#%[HIMprRST]|:#', '', ($conf['dformat']));
+        $onlydate = preg_replace('#%[HIMprRST]|:#', '', $conf['dformat']);
 
-        return '<abbr class="due" title="'.$this->my->_vdate($date, true).'">' . strftime($onlydate, $date) . '</abbr>';
+        return '<abbr class="due" title="'.$this->helper->_vdate($date, true).'">' . strftime($onlydate, $date) . '</abbr>';
     }
 }
-// vim:ts=4:sw=4:et:enc=utf-8:
diff --git a/syntax/taskform.php b/syntax/taskform.php
index 6dabd2d..e078779 100644
--- a/syntax/taskform.php
+++ b/syntax/taskform.php
@@ -7,7 +7,10 @@
  */
 
 class syntax_plugin_task_taskform extends DokuWiki_Syntax_Plugin {
-    protected $helper = NULL;
+    /**
+     * @var helper_plugin_task
+     */
+    protected $helper = null;
 
     /**
      * Constructor. Loads helper plugin.
@@ -16,15 +19,15 @@ public function __construct() {
         $this->helper = plugin_load('helper', 'task');
     }
 
-    function getType() { return 'substition'; }
-    function getPType() { return 'block'; }
-    function getSort() { return 306; }
+    public function getType() { return 'substition'; }
+    public function getPType() { return 'block'; }
+    public function getSort() { return 306; }
 
-    function connectTo($mode) {
+    public function connectTo($mode) {
         $this->Lexer->addSpecialPattern('\{\{task>form>.+?\}\}', $mode, 'plugin_task_taskform');
     }
 
-    function handle($match, $state, $pos, Doku_Handler $handler) {
+    public function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
 
         // strip {{task>form> from start and }} from end
@@ -32,30 +35,35 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
         list($ns, $flags) = array_pad(explode('&', $match, 2), 2,'');
         $flags = explode('&', $flags);
 
-        if (($ns == '*') || ($ns == ':')) $ns = '';
-        elseif ($ns == '.') $ns = getNS($ID);
-        else $ns = cleanID($ns);
+        if ($ns == '*' || $ns == ':') {
+            $ns = '';
+        } elseif ($ns == '.') {
+            $ns = getNS($ID);
+        } else {
+            $ns = cleanID($ns);
+        }
 
-        $selectUserGroup = NULL;
+        $selectUserGroup = null;
         foreach ($flags as $flag) {
             if (substr($flag, 0, 16) == 'selectUserGroup=') {
                 $selectUserGroup = substr($flag, 16);
                 $selectUserGroup = trim($selectUserGroup, '"');
             }
         }
-        return array($ns, $flags, $selectUserGroup);
+        return [$ns, $flags, $selectUserGroup];
     }
 
-    function render($mode, Doku_Renderer $renderer, $data) {
-        if ($mode != 'xhtml') {
-            false;
+    public function render($format, Doku_Renderer $renderer, $data) {
+        if ($format != 'xhtml') {
+            return false;
         }
 
         list($ns, $flags, $selectUserGroup) = $data;
 
         $selectUser = in_array('selectUser', $flags);
-        if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns, $selectUser, $selectUserGroup);
+        if ($this->helper) {
+            $renderer->doc .= $this->helper->newTaskForm($ns, $selectUser, $selectUserGroup);
+        }
         return true;
     }
 }
-// vim:et:ts=4:sw=4:enc=utf-8:
diff --git a/syntax/tasks.php b/syntax/tasks.php
index e0b4265..74452c7 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -7,7 +7,8 @@
  */
 
 class syntax_plugin_task_tasks extends DokuWiki_Syntax_Plugin {
-    protected $helper = NULL;
+    /** @var helper_plugin_task */
+    protected $helper = null;
 
     /**
      * Constructor. Loads helper plugin.
@@ -16,15 +17,22 @@ public function __construct() {
         $this->helper = plugin_load('helper', 'task');
     }
 
-    function getType() { return 'substition'; }
-    function getPType() { return 'block'; }
-    function getSort() { return 306; }
+    public function getType() { return 'substition'; }
+    public function getPType() { return 'block'; }
+    public function getSort() { return 306; }
 
-    function connectTo($mode) {
+    public function connectTo($mode) {
         $this->Lexer->addSpecialPattern('\{\{tasks>.+?\}\}', $mode, 'plugin_task_tasks');
     }
 
-    function handle($match, $state, $pos, Doku_Handler $handler) {
+    /**
+     * @param   string $match The text matched by the patterns
+     * @param   int $state The lexer state for the match
+     * @param   int $pos The character position of the matched text
+     * @param   Doku_Handler $handler The Doku_Handler object
+     * @return  array Return an array with all data you want to use in render, false don't add an instruction
+     */
+    public function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
 
         $match = substr($match, 8, -2); // strip {{topic> from start and }} from end
@@ -33,32 +41,49 @@ function handle($match, $state, $pos, Doku_Handler $handler) {
         list($match, $refine) = array_pad(explode(' ', $match, 2),2,'');
         list($ns, $filter) = array_pad(explode('?', $match, 2),2,'');
 
-        if (($ns == '*') || ($ns == ':')) $ns = '';
-        elseif ($ns == '.') $ns = getNS($ID);
-        else $ns = cleanID($ns);
+        if ($ns == '*' || $ns == ':') {
+            $ns = '';
+        } elseif ($ns == '.') {
+            $ns = getNS($ID);
+        } else {
+            $ns = cleanID($ns);
+        }
 
-        return array($ns, $filter, $flags, $refine);
+        return [$ns, $filter, $flags, $refine];
     }
 
-    function render($mode, Doku_Renderer $renderer, $data) {
+    /**
+     * @param string $format output format being rendered
+     * @param Doku_Renderer $renderer the current renderer object
+     * @param array $data data created by handler()
+     * @return bool rendered correctly? (however, returned value is not used at the moment)
+     */
+    public function render($format, Doku_Renderer $renderer, $data) {
         global $conf;
 
         list($ns, $filter, $flags, $refine) = $data;
 
-        if (!$filter || ($filter == 'select')) {
+        if (!$filter || $filter == 'select') {
             $select = true;
             $filter = trim($_REQUEST['filter']);
         }
         $filter = strtolower($filter);
         $filters = $this->_viewFilters();
-        if (!in_array($filter, $filters)) $filter = 'open';
-        if(isset($_REQUEST['view_user'])) $user = $_REQUEST['view_user'];
+        if (!in_array($filter, $filters)) {
+            $filter = 'open';
+        }
+        if(isset($_REQUEST['view_user'])) {
+            $user = $_REQUEST['view_user'];
+        }
 
-        if ($this->helper) $pages = $this->helper->getTasks($ns, NULL, $filter, $user);
+        if ($this->helper) {
+            $pages = $this->helper->getTasks($ns, null, $filter, $user);
+        }
 
         // use tag refinements?
         if ($refine) {
-            if (plugin_isdisabled('tag') || (!$tag = plugin_load('helper', 'tag'))) {
+            /** @var helper_plugin_tag $tag */
+            if (!$tag = $this->loadHelper('tag', false)) {
                 msg('The Tag Plugin must be installed to use tag refinements.', -1);
             } else {
                 $pages = $tag->tagRefine($pages, $refine);
@@ -66,12 +91,18 @@ function render($mode, Doku_Renderer $renderer, $data) {
         }
 
         if(!$pages) {
-            if($mode != 'xhtml') return true;
+            if($format != 'xhtml') {
+                return true;
+            }
             $renderer->nocache();
-            if($select) $renderer->doc .= $this->_viewMenu($filter);
+            if($select) {
+                $renderer->doc .= $this->_viewMenu($filter);
+            }
             if(auth_quickaclcheck($ns.':*') >= AUTH_CREATE) {
                 if(!in_array('noform', $flags)) {
-                    if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
+                    if ($this->helper) {
+                        $renderer->doc .= $this->helper->newTaskForm($ns);
+                    }
                 }
             }
             return true; // nothing to display
@@ -83,12 +114,14 @@ function render($mode, Doku_Renderer $renderer, $data) {
         if ($c > $perpage) {
             $numOfPages = ceil($c / $perpage);
             $first = $_REQUEST['first'];
-            if (!is_numeric($first)) $first = 0;
+            if (!is_numeric($first)) {
+                $first = 0;
+            }
             $currentPage = round($first / $perpage) + 1;
             $pages = array_slice($pages, $first, $perpage);
         }
 
-        if ($mode == 'xhtml') {
+        if ($format == 'xhtml') {
 
             // prevent caching to ensure content is always fresh
             $renderer->nocache();
@@ -97,19 +130,23 @@ function render($mode, Doku_Renderer $renderer, $data) {
             $perm_create = (auth_quickaclcheck($ns.':*') >= AUTH_CREATE);
             if($perm_create && ($this->getConf('tasks_formposition') == 'top')) {
                 if(!in_array('noform', $flags)) {
-                    if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
+                    if ($this->helper) {
+                        $renderer->doc .= $this->helper->newTaskForm($ns);
+                    }
                 }
             }
 
             // let Pagelist Plugin do the work for us
-            if (plugin_isdisabled('pagelist')
-                    || (!$pagelist = plugin_load('helper', 'pagelist'))) {
+            /** @var helper_plugin_pagelist $pagelist */
+            if (!$pagelist = $this->loadHelper('pagelist', false)) {
                 msg('The Pagelist Plugin must be installed for task lists.', -1);
                 return false;
             }
 
             // show view filter popup if not
-            if ($select) $renderer->doc .= $this->_viewMenu($filter);
+            if ($select) {
+                $renderer->doc .= $this->_viewMenu($filter);
+            }
 
             // prepare pagelist columns
             $pagelist->header['page'] = $this->getLang('task');
@@ -141,7 +178,8 @@ function render($mode, Doku_Renderer $renderer, $data) {
             return true;
 
             // for metadata renderer
-        } elseif ($mode == 'metadata') {
+        } elseif ($format == 'metadata') {
+            /** @var Doku_Renderer_metadata $renderer */
             foreach ($pages as $page) {
                 $renderer->meta['relation']['references'][$page['id']] = true;
             }
@@ -157,7 +195,7 @@ function render($mode, Doku_Renderer $renderer, $data) {
      * Show a popup to select the task view filter.
      * Just forwards call to the old or new function.
      */
-    function _viewMenu($filter) {
+    protected function _viewMenu($filter) {
         if (class_exists('dokuwiki\Form\Form')) {
             return $this->_viewMenuNew($filter);
         } else {
@@ -171,12 +209,12 @@ function _viewMenu($filter) {
      *
      * @see _viewMenu
      */
-    function _viewMenuNew($filter) {
-        global $ID, $lang;
+    protected function _viewMenuNew($filter) {
+        global $ID;
 
         $options = $this->_viewFilters();
 
-        $form = new dokuwiki\Form\Form(array('id' => 'task__changeview_form'));
+        $form = new dokuwiki\Form\Form(['id' => 'task__changeview_form']);
         $pos = 1;
 
         $form->addHTML('<label class="simple">', $pos++);
@@ -187,23 +225,22 @@ function _viewMenuNew($filter) {
         $form->setHiddenField ('do', 'show');
 
         // Select status from drop down list
-        $dropDownOptions = array();
-        $selected = NULL;
-        $value = 0;
+        $dropDownOptions = [];
+        $selected = null;
         foreach ($options as $option) {
             if ($filter == $option) {
                 $selected = $option.' ';
             }
             $dropDownOptions [$option.' '] = $this->getLang('view_'.$option);
         }
-        $input = $form->addDropdown('filter', $dropDownOptions, NULL, $pos++);
+        $input = $form->addDropdown('filter', $dropDownOptions, null, $pos++);
         $input->val($selected);
 
         $form->addHTML('</label>', $pos++);
 
         if(isset($_SERVER['REMOTE_USER'])) {
             $form->addHTML('<label class="simple"><span>'.$this->getLang('view_user').':</span>', $pos++);
-            $input = $form->addCheckbox('view_user', NULL, $pos++);
+            $input = $form->addCheckbox('view_user', null, $pos++);
             $input->attr('value', $_SERVER['REMOTE_USER']);
             if ($_REQUEST['view_user']) {
                 $input->attr('checked', 'checked');
@@ -212,7 +249,7 @@ function _viewMenuNew($filter) {
         }
 
         // Add button
-        $form->addButton(NULL, $this->getLang('btn_refresh'), $pos++);
+        $form->addButton(null, $this->getLang('btn_refresh'), $pos++);
 
         $ret  = '<div class="task_viewmenu">';
         $ret .= $form->toHTML();
@@ -227,7 +264,7 @@ function _viewMenuNew($filter) {
      *
      * @see _viewMenu
      */
-    function _viewMenuOld($filter) {
+    protected function _viewMenuOld($filter) {
         global $ID, $lang;
 
         $options = $this->_viewFilters();
@@ -242,7 +279,9 @@ function _viewMenuOld($filter) {
 
         foreach ($options as $option) {
             $ret .= '<option value="'.$option.'"';
-            if ($filter == $option) $ret .= ' selected="selected"';
+            if ($filter == $option) {
+                $ret .= ' selected="selected"';
+            }
             $ret .= '>'.$this->getLang('view_'.$option).'</option>';
         }
 
@@ -265,9 +304,12 @@ function _viewMenuOld($filter) {
    /**
     * Returns an array of available view filters for the task list
     */
-    function _viewFilters() {
-        if (!$_SERVER['REMOTE_USER']) $filters = array('all', 'open', 'done');
-        else $filters = array('all', 'open', 'new', 'done', 'my', 'rejected', 'started', 'accepted', 'verified');
+    protected function _viewFilters() {
+        if (!$_SERVER['REMOTE_USER']) {
+            $filters = ['all', 'open', 'done'];
+        } else {
+            $filters = ['all', 'open', 'new', 'done', 'my', 'rejected', 'started', 'accepted', 'verified'];
+        }
         if ($this->getConf('datefield')) {
             $filters[] = 'due';
             $filters[] = 'overdue';
@@ -278,22 +320,24 @@ function _viewFilters() {
     /**
     * Returns pagination links if more than one page
     */
-    function _paginationLinks($num, $cur, $filter) {
+    protected function _paginationLinks($num, $cur, $filter) {
         global $ID, $conf;
 
-        if (!is_numeric($num) || ($num < 2)) return '';
+        if (!is_numeric($num) || $num < 2) {
+            return '';
+        }
         $perpage = ($conf['recent'] != 0) ? $conf['recent'] : 20; // prevent division by zero
 
-        $ret = array();
+        $ret = [];
         for ($i = 1; $i <= $num; $i++) {
             if ($i == $cur) {
                 $ret[] = '<strong>'.$i.'</strong>';
             } else {
-                $opt = array();
+                $opt = [];
                 $opt['first']  = $perpage * ($i - 1);
                 $opt['filter'] = $filter;
                 if(isset($_REQUEST['view_user'])) {
-                    $user = array();
+                    $user = [];
                     $user['id'] = $_REQUEST['view_user'];
                     if($this->helper->isResponsible($user)) {
                         $opt['view_user'] = $_REQUEST['view_user'];
@@ -302,9 +346,8 @@ function _paginationLinks($num, $cur, $filter) {
                 $ret[] = '<a href="'.wl($ID, $opt).'" class="wikilink1" title="'.$i.'">'.$i.'</a>';
             }
         }
-        return '<div class="centeralign">'.DOKU_LF.
-            join(' | ', $ret).DOKU_LF.
-            '</div>'.DOKU_LF;
+        return '<div class="centeralign">'.
+            join(' | ', $ret).
+            '</div>';
     }
 }
-// vim:et:ts=4:sw=4:enc=utf-8:

From 217f164c40a9f3ebddfb5d1a4e75bad03d18cf74 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Wed, 14 Sep 2022 00:22:17 +0200
Subject: [PATCH 12/14] fix use of helper, phpdocs, php 8 warning, refactoring,
 renaming

---
 helper.php      |   4 +-
 syntax/task.php | 106 ++++++++++++++++++++++++++++++------------------
 2 files changed, 69 insertions(+), 41 deletions(-)

diff --git a/helper.php b/helper.php
index f474f08..7e12877 100644
--- a/helper.php
+++ b/helper.php
@@ -521,7 +521,7 @@ protected function vsc($string) {
      * @param bool $extended other date format
      * @return false|string
      */
-    protected function vdate($date, $extended = false) {
+    public function vdate($date, $extended = false) {
         if ($extended) {
             return strftime('%Y-%m-%dT%H:%M:%SZ', $date);
         } else {
@@ -535,7 +535,7 @@ protected function vdate($date, $extended = false) {
      * @param int $status
      * @return string
      */
-    protected function vstatus($status) {
+    public function vstatus($status) {
         switch ($status) {
             case -1:
                 return 'CANCELLED';
diff --git a/syntax/task.php b/syntax/task.php
index 8b83259..4405e7f 100644
--- a/syntax/task.php
+++ b/syntax/task.php
@@ -8,6 +8,7 @@
 
 class syntax_plugin_task_task extends DokuWiki_Syntax_Plugin {
 
+    /** @var helper_plugin_task */
     protected $helper = null;
     protected $task = [];
 
@@ -19,6 +20,13 @@ public function connectTo($mode) {
         $this->Lexer->addSpecialPattern('~~TASK.*?~~', $mode, 'plugin_task_task');
     }
 
+    /**
+     * @param   string $match The text matched by the patterns
+     * @param   int $state The lexer state for the match
+     * @param   int $pos The character position of the matched text
+     * @param   Doku_Handler $handler The Doku_Handler object
+     * @return  array Return an array with all data to use in render
+     */
     public function handle($match, $state, $pos, Doku_Handler $handler) {
         global $ID;
         global $ACT;
@@ -28,10 +36,10 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
         $match = substr($match, 6, -2);
         $priority = strspn(strstr($match, '!'), '!');
         $match = trim($match, ':!');
-        list($user, $date) = explode('?', $match);
+        list($user, $date) = array_pad(explode('?', $match), 2, '');
 
         /** @var helper_plugin_task $helper */
-        if ($helper = plugin_load('helper', 'task')) {
+        if ($helper = $this->loadHelper('task')) {
             $date = $helper->interpretDate($date);
 
             $task = [
@@ -55,6 +63,12 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
         return [$user, $date, $priority];
     }
 
+    /**
+     * @param string $format output format being rendered
+     * @param Doku_Renderer $renderer the current renderer object
+     * @param array $data data created by handler()
+     * @return boolean rendered correctly?
+     */
     public function render($format, Doku_Renderer $renderer, $data) {
         global $ID;
 
@@ -66,14 +80,14 @@ public function render($format, Doku_Renderer $renderer, $data) {
             $renderer->nocache();
 
             // prepare data
-            $this->_loadHelper();
+            $this->loadTaskHelper();
 
             $task = [];
             if(@file_exists(metaFN($ID, '.task'))) {
                 $task = $this->helper->readTask($ID);
             }
 
-            $status = $this->_getStatus($user, $sn);
+            $status = $this->getStatus($user, $sn);
             $due = '';
 
             if ($date && $sn < 3) {
@@ -99,29 +113,29 @@ public function render($format, Doku_Renderer $renderer, $data) {
             // generate output
             $renderer->doc .= '<div class="vcalendar">'
                             . '<fieldset'.$class.'>'
-                            . '<legend>'.$this->_icsDownload().$this->getLang('task').'</legend>'
+                            . '<legend>'.$this->htmlIcsDownloadLink().$this->getLang('task').'</legend>'
                             . '<table class="blind">';
 
             if ($user) {
-                $this->_tablerow('user', $this->_hCalUser($user), $renderer, '', 'organizer');
+                $this->renderTableRow('user', $this->htmlhCalUser($user), $renderer, '', 'organizer');
             } elseif ($task['user']['name']) {
-                $this->_tablerow('user', $this->_hCalUser($task['user']['name']), $renderer, '', 'organizer');
+                $this->renderTableRow('user', $this->htmlhCalUser($task['user']['name']), $renderer, '', 'organizer');
             }
 
             if ($date) {
-                $this->_tablerow('date', $this->_hCalDate($date), $renderer, $due);
+                $this->renderTableRow('date', $this->htmlhCalDate($date), $renderer, $due);
             } elseif ($task['date']['due']) {
-                $this->_tablerow('date', $this->_hCalDate($task['date']['due']), $renderer, $due);
+                $this->renderTableRow('date', $this->htmlhCalDate($task['date']['due']), $renderer, $due);
             }
 
             // show status update form only to logged in users
             if(isset($_SERVER['REMOTE_USER'])) {
-                $this->_tablerow('status', $status, $renderer);
+                $this->renderTableRow('status', $status, $renderer);
             }
 
-            $renderer->doc .= '</table>'.DOKU_LF;
-            $renderer->doc .= '</fieldset>'.DOKU_LF.
-            '</div>'.DOKU_LF;
+            $renderer->doc .= '</table>';
+            $renderer->doc .= '</fieldset>'.
+            '</div>';
 
             return true;
 
@@ -142,7 +156,7 @@ public function render($format, Doku_Renderer $renderer, $data) {
      * @param string $trclass class of row
      * @param string $tdclass class of cell
      */
-    protected function _tablerow($header, $data, $renderer, $trclass = '', $tdclass = '') {
+    protected function renderTableRow($header, $data, $renderer, $trclass = '', $tdclass = '') {
         if ($tdclass) {
             $tdclass = ' class="'.$tdclass.'"';
         }
@@ -160,10 +174,12 @@ protected function _tablerow($header, $data, $renderer, $trclass = '', $tdclass
 
     /**
      * Loads the helper plugin and gets task data for current ID
+     *
+     * @return bool loaded successful?
      */
-    protected function _loadHelper() {
+    protected function loadTaskHelper() {
         global $ID;
-        $this->helper = plugin_load('helper', 'task');
+        $this->helper = $this->loadHelper('task');
         if (!is_object($this->helper)) {
             return false;
         }
@@ -173,25 +189,29 @@ protected function _loadHelper() {
 
     /**
      * Returns the status cell contents
+     *
+     * @param string $user name of user
+     * @param int $status by reference, set to status of the task
+     * @return string html
      */
-    protected function _getStatus($user, &$status) {
+    protected function getStatus($user, &$status) {
         global $INFO;
 
         $ret = '';
         $status = $this->task['status'];
-        $responsible = $this->helper->_isResponsible($user);
+        $responsible = $this->helper->isResponsible($user);
 
         if ($INFO['perm'] == AUTH_ADMIN) {
-            $ret = $this->_statusMenu([-1, 0, 1, 2, 3, 4], $status);
+            $ret = $this->statusMenu([-1, 0, 1, 2, 3, 4], $status);
         } elseif ($responsible) {
             if ($status < 3) {
-                $ret = $this->_statusMenu([-1, 0, 1, 2, 3], $status);
+                $ret = $this->statusMenu([-1, 0, 1, 2, 3], $status);
             }
         } else {
             if ($status == 0) {
-                $ret = $this->_statusMenu([0, 1], $status);
+                $ret = $this->statusMenu([0, 1], $status);
             } elseif ($status == 3) {
-                $ret = $this->_statusMenu([2, 3, 4], $status);
+                $ret = $this->statusMenu([2, 3, 4], $status);
             }
         }
 
@@ -199,18 +219,20 @@ protected function _getStatus($user, &$status) {
             $ret = $this->helper->statusLabel($status);
         }
 
-        return '<abbr class="status" title="'.$this->helper->_vstatus($status).'">'. $ret .'</abbr>';
+        return '<abbr class="status" title="'.$this->helper->vstatus($status).'">'. $ret .'</abbr>';
     }
 
     /**
      * Returns the XHTML for the status drop down list.
      * Just forwards call to the old or new function.
+     *
+     * @return string html of a dropdown form
      */
-    protected function _statusMenu($options, $status) {
+    protected function statusMenu($options, $status) {
         if (class_exists('dokuwiki\Form\Form')) {
-            return $this->_statusMenuNew($options, $status);
+            return $this->statusMenuNew($options, $status);
         } else {
-            return $this->_statusMenuOld($options, $status);
+            return $this->statusMenuOld($options, $status);
         }
     }
 
@@ -218,9 +240,10 @@ protected function _statusMenu($options, $status) {
      * Returns the XHTML for the status popup menu.
      * This is the new version using class dokuwiki\Form\Form.
      *
-     * @see _statusMenu
+     * @see statusMenu
+     * @return string html of a dropdown form
      */
-    protected function _statusMenuNew($options, $status) {
+    protected function statusMenuNew($options, $status) {
         global $ID;
 
         $form = new dokuwiki\Form\Form(array('id' => 'task__changetask_form'));
@@ -256,9 +279,10 @@ protected function _statusMenuNew($options, $status) {
      * Returns the XHTML for the status popup menu.
      * Old function generating all HTML on its own.
      *
-     * @see _statusMenu
+     * @see statusMenu
+     * @return string html of a dropdown form
      */
-    protected function _statusMenuOld($options, $status) {
+    protected function statusMenuOld($options, $status) {
         global $ID;
         global $lang;
 
@@ -279,15 +303,17 @@ protected function _statusMenuOld($options, $status) {
         $ret .= '</select>';
         $ret .= '<input class="button" type="submit" value="'.$this->getLang('btn_change').'" />';
         $ret .= '</div>';
-        $ret .= '</form>'.DOKU_LF;
+        $ret .= '</form>';
 
         return $ret;
     }
 
     /**
      * Returns the download link for the iCal file
+     *
+     * @return string html of link
      */
-    protected function _icsDownload() {
+    protected function htmlIcsDownloadLink() {
         global $ID;
         global $INFO;
 
@@ -296,29 +322,31 @@ protected function _icsDownload() {
         $link  = DOKU_BASE.'lib/plugins/task/ics.php?id='.$ID;
         $src   = DOKU_BASE.'lib/plugins/task/images/ics.gif';
 
-        $out   = '<a href="'.$link.'" class="uid" title="'.$uid.'">'
+        return '<a href="'.$link.'" class="uid" title="'.$uid.'">'
                . '<img src="'.$src.'" class="summary" alt="'.$title.'" title="'.$title.'" width="16" height="16"/>'
                . '</a> ';
-
-        return $out;
     }
 
     /**
      * Returns the organizer in hCalendar format as hCard
+     *
+     * @return string html
      */
-    protected function _hCalUser($user) {
+    protected function htmlhCalUser($user) {
         return '<span class="vcard"><span class="fn">' . hsc($user) . '</span></span>';
     }
 
     /**
      * Returns the date in hCalendar format
+     *
+     * @return string html
      */
-    protected function _hCalDate($date) {
+    protected function htmlhCalDate($date) {
         global $conf;
 
         // strip time from preferred date format
-        $onlydate = preg_replace('#%[HIMprRST]|:#', '', $conf['dformat']);
+        $onlydateformat = preg_replace('#%[HIMprRST]|:#', '', $conf['dformat']);
 
-        return '<abbr class="due" title="'.$this->helper->_vdate($date, true).'">' . strftime($onlydate, $date) . '</abbr>';
+        return '<abbr class="due" title="'.$this->helper->vdate($date, true).'">' . strftime($onlydateformat, $date) . '</abbr>';
     }
 }

From c1bef39f6d3f5a952bd3189cf75d497960dde429 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 20 Oct 2022 14:23:09 +0200
Subject: [PATCH 13/14] use $INPUT, reformatting, phpdocs

---
 action.php       |  44 +++++++++++---------
 helper.php       |  46 ++++++++++-----------
 syntax/task.php  |  26 ++++++------
 syntax/tasks.php | 103 +++++++++++++++++++++++++----------------------
 4 files changed, 115 insertions(+), 104 deletions(-)

diff --git a/action.php b/action.php
index 023c436..61441e9 100644
--- a/action.php
+++ b/action.php
@@ -40,11 +40,10 @@ public function handleTaskActions($event, $param) {
      * Creates a new task page
      */
     protected function newTask() {
-        global $ID;
-        global $INFO;
+        global $ID, $INFO, $INPUT;
 
-        $ns    = cleanID($_REQUEST['ns']);
-        $title = str_replace(':', '', $_REQUEST['title']);
+        $ns    = cleanID($INPUT->post->str('ns'));
+        $title = str_replace(':', '', $INPUT->post->str('title'));
         $back  = $ID;
         $ID    = ($ns ? $ns.':' : '').cleanID($title);
         $INFO  = pageinfo();
@@ -63,12 +62,12 @@ protected function newTask() {
             if (!@file_exists($INFO['filepath'])) {
                 global $TEXT;
 
-                $user     = $_REQUEST['user'];
-                $date     = $_REQUEST['date'];
-                $priority = $_REQUEST['priority'];
+                $user     = $INPUT->post->str('user');
+                $date     = $INPUT->post->str('date');
+                $priority = $INPUT->post->str('priority');
 
                 // create wiki page
-                $data = array(
+                $data = [
                         'id'       => $ID,
                         'ns'       => $ns,
                         'title'    => $title,
@@ -76,7 +75,7 @@ protected function newTask() {
                         'priority' => $priority,
                         'user'     => $user,
                         'date'     => $date,
-                        );
+                ];
 
                 $TEXT = $this->_pageTemplate($data);
                 return 'preview';
@@ -90,6 +89,17 @@ protected function newTask() {
 
     /**
      * Adapted version of pageTemplate() function
+     *
+     * @param array $data with:
+     *  'id' => string page id,
+     *  'ns' => string namespace,
+     *  'user' => string user id,
+     *  'date' => string date Y-m-d,
+     *  'back' => string page id of page to go back to,
+     *  'title' => string page title,
+     *  'priority' => string zero to three exclamation marks(!)
+     *
+     * @return string raw wiki text
      */
     function _pageTemplate($data) {
         global $INFO;
@@ -128,20 +138,18 @@ function _pageTemplate($data) {
         }
 
         // do the replace
-        $tpl = str_replace(array_keys($replace), array_values($replace), $tpl);
-        return $tpl;
+        return str_replace(array_keys($replace), array_values($replace), $tpl);
     }
 
     /**
      * Changes the status of a task
      */
     protected function changeTask() {
-        global $ID;
-        global $INFO;
+        global $ID, $INFO, $INPUT;
 
-        $status = $_REQUEST['status'];
+        $status = $INPUT->post->int('status'); //TODO check if other default then 0?
         $status = trim($status);
-        if (!is_numeric($status) || $status < -1 || $status > 4) {
+        if (!is_numeric($status) || $status < -1 || $status > 4) { //FIXME is_numeric not needed
             if ($this->getConf('show_error_msg')) {
                 $message = $this->getLang('msg_rcvd_invalid_status');
                 $message = str_replace('%status%', $status, $message);
@@ -195,7 +203,7 @@ protected function changeTask() {
         // assign task to a user
         if (!$task['user']['name']) {
             // FIXME error message?
-            if (!$_SERVER['REMOTE_USER']) {
+            if (!$INPUT->server->has('REMOTE_USER')) {
                 // no logged in user
                 if ($this->getConf('show_info_msg')) {
                     msg($this->getLang('msg_not_logged_in'));
@@ -212,7 +220,7 @@ protected function changeTask() {
             }
 
             $task['user'] = [
-                    'id'   => $_SERVER['REMOTE_USER'],
+                    'id'   => $INPUT->server->str('REMOTE_USER'),
                     'name' => $INFO['userinfo']['name'],
                     'mail' => $INFO['userinfo']['mail'],
             ];
@@ -222,7 +230,7 @@ protected function changeTask() {
         $oldstatus = $task['status'];
         $task['status'] = $status;
         $helper->writeTask($ID, $task);
-        $_REQUEST['purge'] = true;
+        $INPUT->set('purge', true);
 
         if ($this->getConf('show_success_msg')) {
             $message = $this->getLang('msg_status_changed');
diff --git a/helper.php b/helper.php
index 7e12877..f9ced9c 100644
--- a/helper.php
+++ b/helper.php
@@ -97,14 +97,12 @@ public function td($id) {
      * ]
      */
     public function getTasks($ns, $num = null, $filter = '', $user = null) {
-        global $conf;
+        global $conf, $INPUT;
 
         if (!$filter) {
-            $filter = strtolower($_REQUEST['filter']);
+            $filter = strtolower($INPUT->str('filter'));
         }
 
-        $dir = $conf['datadir'].($ns ? '/'.str_replace(':', '/', $ns): '');
-
         // returns the list of pages in the given namespace and it's subspaces
         $items = [];
         $opts = [];
@@ -153,9 +151,9 @@ public function getTasks($ns, $num = null, $filter = '', $user = null) {
 
             // filter is 'due' or 'overdue'
             if (in_array($filter, ['due', 'overdue'])) {
-                if (!$date || ($date > time()) || ($task['status'] > 2)) continue;
-                elseif (($date + 86400 < time()) && ($filter == 'due')) continue;
-                elseif (($date + 86400 > time()) && ($filter == 'overdue')) continue;
+                if (!$date || $date > time() || $task['status'] > 2) continue;
+                elseif ($date + 86400 < time() && $filter == 'due') continue;
+                elseif ($date + 86400 > time() && $filter == 'overdue') continue;
             }
             $perm = auth_quickaclcheck($id);
 
@@ -434,7 +432,7 @@ protected function notify($task) {
         $text = str_replace('@PAGE@', $ID, $text);
         $text = str_replace('@TITLE@', $conf['title'], $text);
         if(!empty($task['date']['due'])) {
-            $dformat = preg_replace('#%[HIMprRST]|:#', '', ($conf['dformat']));
+            $dformat = preg_replace('#%[HIMprRST]|:#', '', $conf['dformat']);
             $text    = str_replace('@DATE@', strftime($dformat, $task['date']['due']), $text);
         } else {
             $text = str_replace('@DATE@', '', $text);
@@ -452,7 +450,7 @@ protected function notify($task) {
             $subject .= $this->getLang('mail_changedtask');
         }
 
-        mail_send($to, $subject, $text, $conf['mailfrom'], '', $bcc);
+        mail_send($to, $subject, $text, $conf['mailfrom'], '', $bcc); //FIXME replace
     }
 
     /**
@@ -607,10 +605,9 @@ protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null)
         global $ID, $lang, $INFO, $auth;
 
         $form = new dokuwiki\Form\Form(['id' => 'task__newtask_form']);
-        $pos = 1;
 
         // Open fieldset
-        $form->addFieldsetOpen($this->getLang('newtask'), $pos++);
+        $form->addFieldsetOpen($this->getLang('newtask'));
 
         // Set hidden fields
         $form->setHiddenField ('id', $ID);
@@ -618,15 +615,15 @@ protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null)
         $form->setHiddenField ('ns', $ns);
 
         // Set input filed for task title
-        $input = $form->addTextInput('title', null, $pos++);
+        $input = $form->addTextInput('title', null);
         $input->attr('id', 'task__newtask_title');
         $input->attr('size', '40');
 
         // Set input field for user (either text field or drop down box)
-        $form->addHTML('<table class="blind"><tr><th>'.$this->getLang('user').':</th><td>', $pos++);
+        $form->addHTML('<table class="blind"><tr><th>'.$this->getLang('user').':</th><td>');
         if(!$selectUser) {
             // Old way input field
-            $input = $form->addTextInput('user', null, $pos++);
+            $input = $form->addTextInput('user', null);
             $input->attr('value', hsc($INFO['userinfo']['name']));
         } else {
             // Select user from drop down list
@@ -638,17 +635,17 @@ protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null)
                     $options [] = $curr_user['name'];
                 }
             }
-            $input = $form->addDropdown('user', $options, null, $pos++);
+            $input = $form->addDropdown('user', $options, null);
             $input->val($INFO['userinfo']['name']);
         }
-        $form->addHTML('</td></tr>', $pos++);
+        $form->addHTML('</td></tr>');
 
         // Field for due date
         if ($this->getConf('datefield')) {
-            $form->addHTML('<tr><th>'.$this->getLang('date').':</th><td>', $pos++);
-            $input = $form->addTextInput('date', null, $pos++);
+            $form->addHTML('<tr><th>'.$this->getLang('date').':</th><td>');
+            $input = $form->addTextInput('date', null);
             $input->attr('value', date('Y-m-d'));
-            $form->addHTML('</td></tr>', $pos++);
+            $form->addHTML('</td></tr>');
         }
 
         // Select priority from drop down list
@@ -658,18 +655,18 @@ protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null)
         $options ['!'] = $this->getLang('medium');
         $options ['!!'] = $this->getLang('high');
         $options ['!!!'] = $this->getLang('critical');
-        $input = $form->addDropdown('priority', $options, null, $pos++);
+        $input = $form->addDropdown('priority', $options, null);
         $input->attr('size', '1');
         $input->val($this->getLang('low'));
-        $form->addHTML('</td></tr>', $pos++);
+        $form->addHTML('</td></tr>');
 
-        $form->addHTML('</table>', $pos++);
+        $form->addHTML('</table>');
 
         // Add button
-        $form->addButton(null, $lang['btn_create'], $pos++);
+        $form->addButton(null, $lang['btn_create']);
 
         // Close fieldset
-        $form->addFieldsetClose($pos++);
+        $form->addFieldsetClose();
 
         // Generate the HTML-Representation of the form
         $ret = '<div class="newtask_form">';
@@ -684,6 +681,7 @@ protected function newTaskFormNew($ns, $selectUser=false, $selectUserGroup=null)
      * This is the old version, creating all HTML code on its own.
      *
      * @see newTaskForm
+     * @deprecated 2017-03-30
      */
     protected function newTaskFormOld($ns, $selectUser=false, $selectUserGroup=null) {
         global $ID, $lang, $INFO, $auth;
diff --git a/syntax/task.php b/syntax/task.php
index 4405e7f..74eb512 100644
--- a/syntax/task.php
+++ b/syntax/task.php
@@ -70,7 +70,7 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
      * @return boolean rendered correctly?
      */
     public function render($format, Doku_Renderer $renderer, $data) {
-        global $ID;
+        global $ID, $INPUT;
 
         list($user, $date, $priority) = $data;
 
@@ -87,10 +87,10 @@ public function render($format, Doku_Renderer $renderer, $data) {
                 $task = $this->helper->readTask($ID);
             }
 
-            $status = $this->getStatus($user, $sn);
+            $status = $this->getStatus($user, $statusNumber);
             $due = '';
 
-            if ($date && $sn < 3) {
+            if ($date && $statusNumber < 3) {
                 if ($date + 86400 < time()) {
                     $due = 'overdue';
                 }
@@ -129,7 +129,7 @@ public function render($format, Doku_Renderer $renderer, $data) {
             }
 
             // show status update form only to logged in users
-            if(isset($_SERVER['REMOTE_USER'])) {
+            if($INPUT->server->has('REMOTE_USER')) {
                 $this->renderTableRow('status', $status, $renderer);
             }
 
@@ -247,9 +247,8 @@ protected function statusMenuNew($options, $status) {
         global $ID;
 
         $form = new dokuwiki\Form\Form(array('id' => 'task__changetask_form'));
-        $pos = 1;
 
-        $form->addHTML('<div class="no">', $pos++);
+        $form->addHTML('<div class="no">');
 
         // Set hidden fields
         $form->setHiddenField ('id', $ID);
@@ -262,15 +261,15 @@ protected function statusMenuNew($options, $status) {
             if ($status == $option) {
                 $selected = $option.' ';
             }
-            $dropDownOptions [$option.' '] = $this->helper->statusLabel($option);
+            $dropDownOptions[$option.' '] = $this->helper->statusLabel($option);
         }
-        $input = $form->addDropdown('status', $dropDownOptions, null, $pos++);
+        $input = $form->addDropdown('status', $dropDownOptions, null);
         $input->val($selected);
 
         // Add button
-        $form->addButton(null, $this->getLang('btn_change'), $pos++);
+        $form->addButton(null, $this->getLang('btn_change'));
 
-        $form->addHTML('</div>', $pos++);
+        $form->addHTML('</div>');
 
         return $form->toHTML();
     }
@@ -314,11 +313,10 @@ protected function statusMenuOld($options, $status) {
      * @return string html of link
      */
     protected function htmlIcsDownloadLink() {
-        global $ID;
-        global $INFO;
+        global $ID, $INFO, $INPUT;
 
-        $uid   = hsc($ID.'@'.$_SERVER['SERVER_NAME']);
-        $title = hsc($INFO['meta']['title']);
+        $uid   = hsc($ID.'@'.$INPUT->server->str('SERVER_NAME'));
+        $title = hsc($INFO['meta']['title'] ?? '');
         $link  = DOKU_BASE.'lib/plugins/task/ics.php?id='.$ID;
         $src   = DOKU_BASE.'lib/plugins/task/images/ics.gif';
 
diff --git a/syntax/tasks.php b/syntax/tasks.php
index 74452c7..4124e09 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -59,23 +59,26 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
      * @return bool rendered correctly? (however, returned value is not used at the moment)
      */
     public function render($format, Doku_Renderer $renderer, $data) {
-        global $conf;
+        global $conf, $INPUT;
 
         list($ns, $filter, $flags, $refine) = $data;
 
+        $select = false;
         if (!$filter || $filter == 'select') {
             $select = true;
-            $filter = trim($_REQUEST['filter']);
+            $filter = trim($INPUT->str('filter'));
         }
         $filter = strtolower($filter);
-        $filters = $this->_viewFilters();
+        $filters = $this->viewFilters();
         if (!in_array($filter, $filters)) {
             $filter = 'open';
         }
-        if(isset($_REQUEST['view_user'])) {
-            $user = $_REQUEST['view_user'];
+        $user = ''; //FIXME getTasks() does not use $user...
+        if($INPUT->has('view_user')) {
+            $user = $INPUT->str('view_user');
         }
 
+        $pages = [];
         if ($this->helper) {
             $pages = $this->helper->getTasks($ns, null, $filter, $user);
         }
@@ -96,7 +99,7 @@ public function render($format, Doku_Renderer $renderer, $data) {
             }
             $renderer->nocache();
             if($select) {
-                $renderer->doc .= $this->_viewMenu($filter);
+                $renderer->doc .= $this->viewMenu($filter);
             }
             if(auth_quickaclcheck($ns.':*') >= AUTH_CREATE) {
                 if(!in_array('noform', $flags)) {
@@ -111,13 +114,11 @@ public function render($format, Doku_Renderer $renderer, $data) {
         // prepare pagination
         $c = count($pages);
         $perpage = ($conf['recent'] != 0) ? $conf['recent'] : 20; // prevent division by zero
+        $numOfPages = $currentPage = 1;
         if ($c > $perpage) {
             $numOfPages = ceil($c / $perpage);
-            $first = $_REQUEST['first'];
-            if (!is_numeric($first)) {
-                $first = 0;
-            }
-            $currentPage = round($first / $perpage) + 1;
+            $first = $INPUT->int('first');
+            $currentPage = round($first / $perpage) + 1; //TODO check 14/20=0.7==>1, 1+1=2?
             $pages = array_slice($pages, $first, $perpage);
         }
 
@@ -127,8 +128,8 @@ public function render($format, Doku_Renderer $renderer, $data) {
             $renderer->nocache();
 
             // show form to create a new task?
-            $perm_create = (auth_quickaclcheck($ns.':*') >= AUTH_CREATE);
-            if($perm_create && ($this->getConf('tasks_formposition') == 'top')) {
+            $hasCreatePermission = auth_quickaclcheck($ns.':*') >= AUTH_CREATE;
+            if($hasCreatePermission && $this->getConf('tasks_formposition') == 'top') {
                 if(!in_array('noform', $flags)) {
                     if ($this->helper) {
                         $renderer->doc .= $this->helper->newTaskForm($ns);
@@ -145,7 +146,7 @@ public function render($format, Doku_Renderer $renderer, $data) {
 
             // show view filter popup if not
             if ($select) {
-                $renderer->doc .= $this->_viewMenu($filter);
+                $renderer->doc .= $this->viewMenu($filter);
             }
 
             // prepare pagelist columns
@@ -166,10 +167,10 @@ public function render($format, Doku_Renderer $renderer, $data) {
                 $pagelist->addPage($page);
             }
             $renderer->doc .= $pagelist->finishList();
-            $renderer->doc .= $this->_paginationLinks($numOfPages, $currentPage, $filter);
+            $renderer->doc .= $this->paginationLinks($numOfPages, $currentPage, $filter);
 
             // show form to create a new task?
-            if($perm_create && ($this->getConf('tasks_formposition') == 'bottom')) {
+            if($hasCreatePermission && ($this->getConf('tasks_formposition') == 'bottom')) {
                 if(!in_array('noform', $flags)) {
                     if ($this->helper) $renderer->doc .= $this->helper->newTaskForm($ns);
                 }
@@ -195,11 +196,11 @@ public function render($format, Doku_Renderer $renderer, $data) {
      * Show a popup to select the task view filter.
      * Just forwards call to the old or new function.
      */
-    protected function _viewMenu($filter) {
+    protected function viewMenu($filter) {
         if (class_exists('dokuwiki\Form\Form')) {
-            return $this->_viewMenuNew($filter);
+            return $this->viewMenuNew($filter);
         } else {
-            return $this->_viewMenuOld($filter);
+            return $this->viewMenuOld($filter);
         }
     }
 
@@ -207,12 +208,12 @@ protected function _viewMenu($filter) {
      * Show a popup to select the task view filter.
      * This is the new version using class dokuwiki\Form\Form.
      *
-     * @see _viewMenu
+     * @see viewMenu
      */
-    protected function _viewMenuNew($filter) {
-        global $ID;
+    protected function viewMenuNew($filter) {
+        global $ID, $INPUT;
 
-        $options = $this->_viewFilters();
+        $options = $this->viewFilters();
 
         $form = new dokuwiki\Form\Form(['id' => 'task__changeview_form']);
         $pos = 1;
@@ -238,11 +239,11 @@ protected function _viewMenuNew($filter) {
 
         $form->addHTML('</label>', $pos++);
 
-        if(isset($_SERVER['REMOTE_USER'])) {
+        if($INPUT->server->has('REMOTE_USER')) {
             $form->addHTML('<label class="simple"><span>'.$this->getLang('view_user').':</span>', $pos++);
             $input = $form->addCheckbox('view_user', null, $pos++);
-            $input->attr('value', $_SERVER['REMOTE_USER']);
-            if ($_REQUEST['view_user']) {
+            $input->attr('value', $INPUT->server->str('REMOTE_USER'));
+            if ($INPUT->str('view_user')) {
                 $input->attr('checked', 'checked');
             }
             $form->addHTML('</label>', $pos++);
@@ -262,12 +263,12 @@ protected function _viewMenuNew($filter) {
      * Show a popup to select the task view filter.
      * Old function generating all HTML on its own.
      *
-     * @see _viewMenu
+     * @see viewMenu
      */
-    protected function _viewMenuOld($filter) {
-        global $ID, $lang;
+    protected function viewMenuOld($filter) {
+        global $ID, $lang, $INPUT;
 
-        $options = $this->_viewFilters();
+        $options = $this->viewFilters();
 
         $ret  = '<div class="task_viewmenu">';
         $ret .= '<form id="task__changeview_form" method="post" action="'.script().'" accept-charset="'.$lang['encoding'].'">';
@@ -288,10 +289,10 @@ protected function _viewMenuOld($filter) {
         $ret .= '</select>';
         $ret .= '</label>';
 
-        if(isset($_SERVER['REMOTE_USER'])) {
+        if($INPUT->server->has('REMOTE_USER')) {
             $ret .= '<label class="simple"><span>'.$this->getLang('view_user').':</span>';
-            $ret .= '<input type="checkbox" name="view_user" value="' . $_SERVER['REMOTE_USER'] . '"';
-            $ret .= ($_REQUEST['view_user']) ? ' checked="checked"' : '';
+            $ret .= '<input type="checkbox" name="view_user" value="' . $INPUT->server->str('REMOTE_USER') . '"';
+            $ret .= $INPUT->str('view_user') ? ' checked="checked"' : '';
             $ret .= '/></label>';
         }
 
@@ -304,11 +305,12 @@ protected function _viewMenuOld($filter) {
    /**
     * Returns an array of available view filters for the task list
     */
-    protected function _viewFilters() {
-        if (!$_SERVER['REMOTE_USER']) {
-            $filters = ['all', 'open', 'done'];
-        } else {
+    protected function viewFilters() {
+        global $INPUT;
+        if ($INPUT->server->has('REMOTE_USER')) {
             $filters = ['all', 'open', 'new', 'done', 'my', 'rejected', 'started', 'accepted', 'verified'];
+        } else {
+            $filters = ['all', 'open', 'done'];
         }
         if ($this->getConf('datefield')) {
             $filters[] = 'due';
@@ -318,10 +320,15 @@ protected function _viewFilters() {
     }
 
     /**
-    * Returns pagination links if more than one page
-    */
-    protected function _paginationLinks($num, $cur, $filter) {
-        global $ID, $conf;
+     * Returns html of pagination links if more than one page
+     *
+     * @param int $num number of pagination pages
+     * @param int $cur current pagination page no
+     * @param string $filter current active filter
+     * @return string html of pagination links
+     */
+    protected function paginationLinks($num, $cur, $filter) {
+        global $ID, $conf, $INPUT;
 
         if (!is_numeric($num) || $num < 2) {
             return '';
@@ -333,17 +340,17 @@ protected function _paginationLinks($num, $cur, $filter) {
             if ($i == $cur) {
                 $ret[] = '<strong>'.$i.'</strong>';
             } else {
-                $opt = [];
-                $opt['first']  = $perpage * ($i - 1);
-                $opt['filter'] = $filter;
-                if(isset($_REQUEST['view_user'])) {
+                $param = [];
+                $param['first']  = $perpage * ($i - 1);
+                $param['filter'] = $filter;
+                if($INPUT->has('view_user')) {
                     $user = [];
-                    $user['id'] = $_REQUEST['view_user'];
+                    $user['id'] = $INPUT->str('view_user');
                     if($this->helper->isResponsible($user)) {
-                        $opt['view_user'] = $_REQUEST['view_user'];
+                        $param['view_user'] = $INPUT->str('view_user');
                     }
                 }
-                $ret[] = '<a href="'.wl($ID, $opt).'" class="wikilink1" title="'.$i.'">'.$i.'</a>';
+                $ret[] = '<a href="'.wl($ID, $param).'" class="wikilink1" title="'.$i.'">'.$i.'</a>';
             }
         }
         return '<div class="centeralign">'.

From 1e72c2ec9d0a0dcf949000c0ba50ac8d28940d61 Mon Sep 17 00:00:00 2001
From: Gerrit Uitslag <klapinklapin@gmail.com>
Date: Thu, 20 Oct 2022 14:23:39 +0200
Subject: [PATCH 14/14] use new helper functions of pagelist plugin, deprecated
 old

---
 syntax/tasks.php | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/syntax/tasks.php b/syntax/tasks.php
index 4124e09..4be461b 100644
--- a/syntax/tasks.php
+++ b/syntax/tasks.php
@@ -150,13 +150,31 @@ public function render($format, Doku_Renderer $renderer, $data) {
             }
 
             // prepare pagelist columns
-            $pagelist->header['page'] = $this->getLang('task');
-            $pagelist->header['date'] = str_replace(' ', '&nbsp;', $this->getLang('date'));
-            $pagelist->header['user'] = str_replace(' ', '&nbsp;', $this->getLang('user'));
-            $pagelist->column['date'] = $this->getConf('datefield');
-            $pagelist->column['user'] = true;
-            $pagelist->setFlags($flags);
-            $pagelist->addColumn('task', 'status');
+            /* @deprecated 2022-10-17 */
+            if(method_exists($pagelist, 'setHeader')) {
+                //since 2022-10-17 some new methods are introduced
+                $pagelist->setHeader([
+                    'page' => $this->getLang('task'),
+                    'date' => str_replace(' ', '&nbsp;', $this->getLang('date')),
+                    'user' => str_replace(' ', '&nbsp;', $this->getLang('user'))
+                ]);
+                $pagelist->modifyColumn('date', $this->getConf('datefield'));
+                $pagelist->modifyColumn('user', true);
+                $pagelist->addColumn('task', 'status');
+                $pagelist->setFlags(['header']); //allow override via user provided flags
+                $pagelist->setFlags($flags);
+            } else {
+                //before 2022-10-17
+                $pagelist->header['page'] = $this->getLang('task');
+                $pagelist->header['date'] = str_replace(' ', '&nbsp;', $this->getLang('date'));
+                $pagelist->header['user'] = str_replace(' ', '&nbsp;', $this->getLang('user'));
+                $pagelist->column['date'] = $this->getConf('datefield');
+                $pagelist->column['user'] = true;
+                $pagelist->setFlags(['header']); //allow override via user provided flags
+                $pagelist->setFlags($flags);
+                $pagelist->addColumn('task', 'status');
+            }
+
 
             // output list
             $pagelist->startList();