Merge branch 'master' into pr72

# Conflicts:
#	plugin.info.txt
#	syntax.php

Author: dregad

plugin.info.txt

@@ -2,7 +2,7 @@
 base   addnewpage
 author Damien Regad, Benjamin Santalucia, Sam Wilson and other contributors
 email  [email protected]
-date   2017-05-29
+date   2023-05-10
 name   Add New Page plugin
 desc   Adds a "new page form" to any wiki page.
 url    https://www.dokuwiki.org/plugin:addnewpage

syntax.php

@@ -10,12 +10,13 @@
  * @noinspection PhpMissingParamTypeInspection, PhpMissingReturnTypeInspection
  */
 
+use dokuwiki\Extension\SyntaxPlugin;
 use dokuwiki\File\PageResolver;
 
 // must be run within Dokuwiki
 if(!defined('DOKU_INC')) die();
 
-class syntax_plugin_addnewpage extends DokuWiki_Syntax_Plugin {
+class syntax_plugin_addnewpage extends SyntaxPlugin {
 
     /** @var array the parsed options */
     protected $options;
@@ -102,7 +103,7 @@ public function handle($match, $state, $pos, Doku_Handler $handler) {
     /**
      * Create the new-page form.
      *
-     * @param   $format     string        output format being rendered
+     * @param   $format   string        output format being rendered
      * @param   $renderer Doku_Renderer the current renderer object
      * @param   $data     array         data created by handler()
      * @return  boolean                 rendered correctly?
@@ -126,17 +127,15 @@ public function render($format, Doku_Renderer $renderer, $data) {
             }
             if($disablecache) $renderer->info['cache'] = false;
 
-            $newpagetemplateinput = $this->_htmlTemplateInput($data['newpagetemplates']);
-
             $input = 'text';
             if($this->options['autopage']) $input = 'hidden';
 
             $form = '<div class="addnewpage"><p>'
                 . '<form name="addnewpage" method="get" action="' . DOKU_BASE . DOKU_SCRIPT . '" accept-charset="' . $lang['encoding'] . '">'
                 . $namespaceinput
                 . '<input class="edit" type="'.$input.'" name="title" size="20" maxlength="255" tabindex="2" />'
-                . $newpagetemplateinput
-                . '<input type="hidden" name="newpagevars" value="' . $data['newpagevars'] . '"/>'
+                . $this->_htmlTemplateInput($data['newpagetemplates'])
+                . $this->_htmlTemplateVars($data['newpagevars'])
                 . '<input type="hidden" name="do" value="edit" />'
                 . '<input type="hidden" name="id" />'
                 . '<input class="button" type="submit" value="' . $this->getLang('okbutton') . '" tabindex="4" />'
@@ -355,11 +354,13 @@ protected function _getNamespaceList($topns = '') {
      * @param array $newpagetemplates array of namespace templates
      * @return string html of select or hidden input
      */
-    public function _htmlTemplateInput($newpagetemplates) {
+    protected function _htmlTemplateInput($newpagetemplates) {
         $cnt = count($newpagetemplates);
         if($cnt < 1 || $cnt == 1 && $newpagetemplates[0] == '') {
-            $input = '';
-
+            // Workaround for newpagetemplate plugin not checking for request var existence
+            // https://github.com/turnermm/newpagetemplate/pull/10
+            // When fixed, replace next line by `$input = '';`
+            $input = '<input type="hidden" name="newpagetemplate" />';
         } else {
             if($cnt == 1) {
                 list($template,) = $this->_parseNSTemplatePage($newpagetemplates[0]);
@@ -382,6 +383,22 @@ public function _htmlTemplateInput($newpagetemplates) {
         return $input;
     }
 
+    /**
+     * Generate html for namespace template variables.
+     *
+     * @param string $newpagevars
+     *
+     * @return string html of hidden input
+     */
+    protected function _htmlTemplateVars($newpagevars) {
+        return $newpagevars
+            ? '<input type="hidden" name="newpagevars" value="' . $newpagevars . '"/>'
+            // Workaround for newpagetemplate plugin not checking for request var existence
+            // https://github.com/turnermm/newpagetemplate/pull/10
+            // When fixed, replace next line by `: '';`
+            : '<input type="hidden" name="newpagevars" />';
+    }
+
     /**
      * Parses and resolves the namespace template page
      *