Permalink
Browse files

Merge branch 'master' into psr2

* master:
  fix: throw RemoteAccessDeniedException if not admin
  feat(RemoteAPI): Add call to delete Users to the remote API 
  removed obsolete language files
  translation update
  decrease php versions by one
  appveyor: updated PHP versions
  another try at fixing appveyor php downloads using curl
  • Loading branch information...
splitbrain committed May 25, 2018
2 parents 661c1dd + 2cceef4 commit 8eb28c6d38a0c41e43b9f531ff138d220d82dc8b
@@ -8,12 +8,15 @@ version: '{build}.{branch}'

environment:
matrix:
- PHP_VERSION: '7.0.21'
- PHP_VERSION: '7.2.4'
VC: 'VC15'
PHPUNIT: '7'
- PHP_VERSION: '7.0.29'
VC: 'VC14'
PHPUNIT: '6.3'
- PHP_VERSION: '5.6.30'
PHPUNIT: '6'
- PHP_VERSION: '5.6.35'
VC: 'VC11'
PHPUNIT: '5.7'
PHPUNIT: '5'

cache:
- c:\php -> appveyor.yml
@@ -26,7 +29,7 @@ install:
- IF NOT EXIST c:\php mkdir c:\php
- IF NOT EXIST c:\php\%PHP_VERSION% mkdir c:\php\%PHP_VERSION%
- cd c:\php\%PHP_VERSION%
- IF NOT EXIST php-installed.txt appveyor DownloadFile https://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-Win32-%VC%-x86.zip
- IF NOT EXIST php-installed.txt curl -fsSL -o php-%PHP_VERSION%-Win32-%VC%-x86.zip https://windows.php.net/downloads/releases/archives/php-%PHP_VERSION%-Win32-%VC%-x86.zip
- IF NOT EXIST php-installed.txt 7z x php-%PHP_VERSION%-Win32-%VC%-x86.zip -y >nul
- IF NOT EXIST php-installed.txt del /Q *.zip
- IF NOT EXIST php-installed.txt copy /Y php.ini-development php.ini
@@ -38,7 +41,7 @@ install:
- IF NOT EXIST php-installed.txt echo extension=php_gd2.dll >> php.ini
- IF NOT EXIST php-installed.txt echo extension=php_bz2.dll >> php.ini
- IF NOT EXIST php-installed.txt echo extension=php_pdo_sqlite.dll >> php.ini
- IF NOT EXIST php-installed.txt appveyor DownloadFile https://phar.phpunit.de/phpunit-%PHPUNIT%.phar -FileName phpunit.phar
- IF NOT EXIST php-installed.txt curl -fsSL -o phpunit.phar https://phar.phpunit.de/phpunit-%PHPUNIT%.phar
- IF NOT EXIST php-installed.txt type nul >> php-installed.txt

test_script:
@@ -77,7 +77,11 @@ public function __getRemoteInfo()
'args' => array('string', 'string', 'array'),
'return' => 'bool',
'doc' => 'Append text to a wiki page.'
), 'wiki.getPage' => array(
), 'dokuwiki.deleteUsers' => array(
'args' => array('array'),
'return' => 'bool',
'doc' => 'Remove one or more users from the list of registered users.'
), 'wiki.getPage' => array(
'args' => array('string'),
'return' => 'string',
'doc' => 'Get the raw Wiki text of page, latest version.',
@@ -576,6 +580,25 @@ public function appendPage($id, $text, $params)
return $this->putPage($id, $currentpage . $text, $params);
}
/**
* Remove one or more users from the list of registered users
*
* @param string[] $usernames List of usernames to remove
*
* @return bool
*
* @throws AccessDeniedException
*/
public function deleteUsers($usernames)
{
if (!auth_isadmin()) {
throw new AccessDeniedException('Only admins are allowed to delete users', 114);
}
/** @var DokuWiki_Auth_Plugin $auth */
global $auth;
return (bool)$auth->triggerUserMod('deleteUsers', $usernames);
}
/**
* Uploads a file to the wiki.
*
@@ -3,6 +3,7 @@
/**
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
*
* @author Sebastian Engel <mail@engel-s.de>
* @author Karl_de_Hall <Karl.Grohmueller@sonnenhof-sha.de>
* @author Michael Bohn <mjbohn@gmail.com>
* @author Joel Strasser <strasser999@gmail.com>
@@ -139,15 +140,15 @@
$lang['js']['media_drop'] = 'Dateien hier hinziehen um sie hochzuladen';
$lang['js']['media_cancel'] = 'Entfernen';
$lang['js']['media_overwrt'] = 'Existierende Dateien überschreiben';
$lang['search_exact_match'] = 'genaue Treffer';
$lang['search_starts_with'] = 'beginnt mit';
$lang['search_ends_with'] = 'endet mit';
$lang['search_contains'] = 'enthält';
$lang['search_custom_match'] = 'angepasst ';
$lang['search_any_ns'] = 'alle Kategorien';
$lang['search_any_time'] = 'jederzeit';
$lang['search_past_7_days'] = 'letzte Woche';
$lang['search_past_month'] = 'letzter Monat';
$lang['search_exact_match'] = 'Genaue Treffer';
$lang['search_starts_with'] = 'Beginnt mit';
$lang['search_ends_with'] = 'Endet mit';
$lang['search_contains'] = 'Enthält';
$lang['search_custom_match'] = 'Angepasst ';
$lang['search_any_ns'] = 'Alle Namensräume';
$lang['search_any_time'] = 'Jederzeit';
$lang['search_past_7_days'] = 'Letzte Woche';
$lang['search_past_month'] = 'Letzter Monat';
$lang['search_past_year'] = 'letztes Jahr';
$lang['search_sort_by_hits'] = 'Sortiere nach Treffer';
$lang['search_sort_by_mtime'] = 'Sortiere nach letzter Änderung';

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 8eb28c6

Please sign in to comment.