Upgrade to 2022-07-31a Igor

Author: kelunik

dokuwiki/SECURITY.md

@@ -0,0 +1,16 @@
+# Security Policy
+
+Security vulnerabilities can be reported for the current stable release (branch `stable`) and the `master` branch.
+
+We try to fix vulnerabilites as fast as possible, but please keep in mind that this is a project run by volunteers. Depending on the severity we may release hotfixes for the current stable release or may simply incorporate the fix in the next proper release.
+
+**This policy only applies to DokuWiki and the bundled plugins. Do not report issues about 3rd party plugins here.**
+
+## Reporting a Vulnerability
+
+You have multiple options on reporting vulnerabilities
+
+* Use [huntr.dev](https://www.huntr.dev/bounties/disclose/?target=https%3A%2F%2Fgithub.com%2Fsplitbrain%2Fdokuwiki%2F)
+* Send an e-mail to [Andi](mailto:[email protected])
+* Open a [Github Issue](https://github.com/splitbrain/dokuwiki/issues)
+* Send a mail to the [Mailing List](https://www.dokuwiki.org/mailinglist)

dokuwiki/VERSION

@@ -1 +1 @@
-2020-07-29a "Hogfather"
+2022-07-31a "Igor"

dokuwiki/bin/dwpage.php

@@ -118,6 +118,27 @@ protected function setup(Options $options) {
             true,
             'unlock'
         );
+
+        /* gmeta command */
+        $options->registerCommand(
+            'getmeta',
+            'Prints metadata value for a page to stdout.'
+        );
+        $options->registerArgument(
+            'wikipage',
+            'The wiki page to get the metadata for',
+            true,
+            'getmeta'
+        );
+        $options->registerArgument(
+            'key',
+            'The name of the metadata item to be retrieved.' . "\n" .
+            'If empty, an array of all the metadata items is returned.' ."\n" .
+            'For retrieving items that are stored in sub-arrays, separate the ' .
+            'keys of the different levels by spaces, in quotes, eg "date modified".',
+            false,
+            'getmeta'
+        );
     }
 
     /**
@@ -160,6 +181,13 @@ protected function main(Options $options) {
                 $this->clearLock($wiki_id);
                 $this->success("$wiki_id unlocked");
                 break;
+            case 'getmeta':
+                $wiki_id = array_shift($args);
+                $key = trim(array_shift($args));
+                $meta = p_get_metadata($wiki_id, $key, METADATA_RENDER_UNLIMITED);
+                echo trim(json_encode($meta, JSON_PRETTY_PRINT));
+                echo "\n";
+                break;
             default:
                 echo $options->help();
         }

dokuwiki/bin/wantedpages.php

@@ -1,6 +1,8 @@
 #!/usr/bin/env php
 <?php
 
+use dokuwiki\Utf8\Sort;
+use dokuwiki\File\PageResolver;
 use splitbrain\phpcli\CLI;
 use splitbrain\phpcli\Options;
 
@@ -77,13 +79,13 @@ protected function main(Options $options) {
         foreach($this->getPages($startdir) as $page) {
             $this->internalLinks($page);
         }
-        ksort($this->result);
+        Sort::ksort($this->result);
         foreach($this->result as $main => $subs) {
             if($this->skip) {
                 print "$main\n";
             } else {
                 $subs = array_unique($subs);
-                sort($subs);
+                Sort::sort($subs);
                 foreach($subs as $sub) {
                     printf("%-40s %s\n", $main, $sub);
                 }
@@ -160,14 +162,12 @@ protected function getPages($dir) {
     protected function internalLinks($page) {
         global $conf;
         $instructions = p_get_instructions(file_get_contents($page['file']));
-        $cns = getNS($page['id']);
-        $exists = false;
+        $resolver = new PageResolver($page['id']);
         $pid = $page['id'];
         foreach($instructions as $ins) {
             if($ins[0] == 'internallink' || ($conf['camelcase'] && $ins[0] == 'camelcaselink')) {
-                $mid = $ins[1][0];
-                resolve_pageid($cns, $mid, $exists);
-                if(!$exists) {
+                $mid = $resolver->resolveId($ins[1][0]);
+                if(!page_exists($mid)) {
                     list($mid) = explode('#', $mid); //record pages without hashes
 
                     if($this->sort == 'origin') {

dokuwiki/composer.json

@@ -0,0 +1,33 @@
+{
+    "name": "splitbrain/dokuwiki",
+    "description": "DokuWiki is a simple to use and highly versatile Open Source wiki software that doesn't require a database",
+    "homepage": "https://www.dokuwiki.org",
+    "type": "project",
+    "license": "GPL v2",
+    "require": {
+        "php": ">=7.2",
+        "ext-json": "*",
+        "splitbrain/php-archive": "~1.0",
+        "phpseclib/phpseclib": "~2.0",
+        "simplepie/simplepie": "^1.4",
+        "geshi/geshi": "dev-master as 1.0.x-dev",
+        "openpsa/universalfeedcreator": "^1.8",
+        "aziraphale/email-address-validator": "^2",
+        "marcusschwarz/lesserphp": "^0.5.1",
+        "splitbrain/php-cli": "^1.1",
+        "splitbrain/slika": "^1.0",
+        "kissifrot/php-ixr": "^1.8"
+    },
+    "config": {
+        "platform": {
+            "php": "7.2"
+        }
+    },
+    "suggest": {
+        "ext-mbstring": "The mbstring extension is highly reccomended to speed up all UTF-8 handling",
+        "ext-intl": "The intl extension allows for better locale specific sorting",
+        "squizlabs/php_codesniffer": "PHP_CodeSniffer tokenizes PHP, JavaScript and CSS files and detects violations of a defined set of coding standards.",
+        "phpunit/phpunit": "Allows automated tests to be run without system-wide install (only version 4-7 are supported)."
+    },
+    "prefer-stable": true
+}