From bf00b3965f373b9497752ef97b25d9f29be35ca0 Mon Sep 17 00:00:00 2001
From: Andreas Gohr <gohr@cosmocode.de>
Date: Mon, 9 Feb 2015 10:22:12 +0100
Subject: [PATCH] fix username handling in dwpage CLI tool. closes #1019
---
bin/dwpage.php | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/bin/dwpage.php b/bin/dwpage.php
index a777fd3e1..d7f6e9bb8 100755
--- a/bin/dwpage.php
+++ b/bin/dwpage.php
@@ -28,7 +28,8 @@ class PageCLI extends DokuCLI {
$options->registerOption(
'user',
'work as this user. defaults to current CLI user',
- 'u'
+ 'u',
+ 'username'
);
$options->setHelp(
'Utility to help command line Dokuwiki page editing, allow '.
@@ -239,6 +240,7 @@ class PageCLI extends DokuCLI {
if($this->force) $this->deleteLock($wiki_id);
$_SERVER['REMOTE_USER'] = $this->username;
+
if(checklock($wiki_id)) {
$this->error("Page $wiki_id is already locked by another user");
exit(1);
@@ -246,7 +248,6 @@ class PageCLI extends DokuCLI {
lock($wiki_id);
- $_SERVER['REMOTE_USER'] = '_'.$this->username.'_';
if(checklock($wiki_id) != $this->username) {
$this->error("Unable to obtain lock for $wiki_id ");
var_dump(checklock($wiki_id));
--
GitLab