JcDenis
/
httpPassword
1
0
Fork 0
Code Issues Pull Requests Releases 3 Activity

Compare commits

base: JcDenis:5e68594f22a8728d0c00eefe87c8c26c0d0a4def
Branches Tags
JcDenis:master
JcDenis:v1.5.1
JcDenis:v1.5
JcDenis:v1.4
..
compare: JcDenis:12fb9cd689ce1eaae5fa32f8ee4e06e63ce02de2
Branches Tags
JcDenis:master
JcDenis:v1.5.1
JcDenis:v1.5
JcDenis:v1.4

No commits in common. "5e68594f22a8728d0c00eefe87c8c26c0d0a4def" and "12fb9cd689ce1eaae5fa32f8ee4e06e63ce02de2" have entirely different histories.
5e68594f22 ... 12fb9cd689

12 changed files with 250 additions and 155 deletions
Show Stats Expand all files Collapse all files

108
CHANGELOG.md
View File

@ -1,79 +1,59 @@
httpPassword 1.4 - 2023.08.12 1.3 - 2023.05.13
=========================================================== - require dotclear 2.26
* Require Dotclear 2.27 - fix type hint and nullsafe warnings
* Require PHP 7.4+
* Upgrade to Dotclear 2.27
* Remove custom permission, only admin can handle httpPassword
* Move third party repository
* Use Dotclear style for CHANGELOG
httpPassword 1.3 - 2023.05.13 1.2 - 2023.04.22
=========================================================== - require dotclear 2.26
* require dotclear 2.26 - add plugin Uninstaller features
* fix type hint and nullsafe warnings - use latest dotclear namespace
- fix static init
- fix permission
- code doc and review
httpPassword 1.2 - 2023.04.22 1.1 - 2023.03.25
=========================================================== - require dotclear 2.26
* require dotclear 2.26 - use namespace
* add plugin Uninstaller features
* use latest dotclear namespace
* fix static init
* fix permission
* code doc and review
httpPassword 1.1 - 2023.03.25 1.0 - 2022.12.30
=========================================================== - update to dotclear 2.24
* require dotclear 2.26 - change settings names
* use namespace - remove debug mode
- use dcLog table for last logins
httpPassword 1.0 - 2022.12.30 0.5.10
=========================================================== - fix typo
* update to dotclear 2.24 - fix for PHP 5.3 compliance
* change settings names
* remove debug mode
* use dcLog table for last logins
httpPassword 0.5.10 0.5.9
=========================================================== - fix bug in history page (PHP errors when history was empty)
* fix typo - add page "debug" in plugin page in order to get infos about hosting setup (when plugins fails to authenticate users)
* fix for PHP 5.3 compliance
httpPassword 0.5.9 0.5
=========================================================== - deep rewrite : HTTP auth is not directly handled by apache anymore but by a dotclear behavior
* fix bug in history page (PHP errors when history was empty) - add support of multiblog installation (thanks to Stephanie "piloue" and Gabriel for being so patient and their helpfull tests)
* add page "debug" in plugin page in order to get infos about hosting setup (when plugins fails to authenticate users) - add support PHP running as CGI (tested with OVH hosting services)
- auto-detect crypt functions available and let user choose it
httpPassword 0.5 - HTTP auth is not required in order to access to blog admin
=========================================================== - plugin admin page with tabs
* deep rewrite : HTTP auth is not directly handled by apache anymore but by a dotclear behavior - plugin imported to dotclear lab
* add support of multiblog installation (thanks to Stephanie "piloue" and Gabriel for being so patient and their helpfull tests)
* add support PHP running as CGI (tested with OVH hosting services)
* auto-detect crypt functions available and let user choose it
* HTTP auth is not required in order to access to blog admin
* plugin admin page with tabs
* plugin imported to dotclear lab
Known issues : This plugin does not protect non-php files (images, css, js) Known issues : This plugin does not protect non-php files (images, css, js)
httpPassword 0.4 0.4
=========================================================== - check filepermission when running
* check filepermission when running - add free.fr support
* add free.fr support
httpPassword 0.3 0.3
=========================================================== - add last connection tracker
* add last connection tracker
httpPassword 0.2 - 2008.11.22 0.2 - 2008.11.22
=========================================================== - _install.php added
* _install.php added - password crypt function setting added
* password crypt function setting added - password crypt function can be choose within trim, crypt, md5, sha1
* password crypt function can be choose within trim, crypt, md5, sha1 - remonte crypt function added as rcrypt rmd5 and rsha1 : crypt function
* remonte crypt function added as rcrypt rmd5 and rsha1 : crypt function
is called over http://frederic.ple.name/.... is called over http://frederic.ple.name/....
This feature can ensure plugin running on php restricted environment This feature can ensure plugin running on php restricted environment
(ex: OVH.COM) (ex: OVH.COM)
httpPassword 0.1 : 2008-11-17 0.1 : 2008-11-17
=========================================================== - INITIAL public release
* INITIAL public release

33
README.md
View File

@ -1,10 +1,11 @@
# README # README
[![Release](https://img.shields.io/badge/release-1.4-a2cbe9.svg)](https://git.dotclear.watch/JcDenis/httpPassword/releases) [![Release](https://img.shields.io/github/v/release/JcDenis/httpPassword)](https://github.com/JcDenis/httpPassword/releases)
[![Date](https://img.shields.io/badge/date-2023.08.12-c44d58.svg)](https://git.dotclear.watch/JcDenis/httpPassword/releases) [![Date](https://img.shields.io/github/release-date/JcDenis/httpPassword)](https://github.com/JcDenis/httpPassword/releases)
[![Dotclear](https://img.shields.io/badge/dotclear-v2.27-137bbb.svg)](https://fr.dotclear.org/download) [![Issues](https://img.shields.io/github/issues/JcDenis/httpPassword)](https://github.com/JcDenis/httpPassword/issues)
[![Dotaddict](https://img.shields.io/badge/dotaddict-official-9ac123.svg)](https://plugins.dotaddict.org/dc2/details/httpPassword) [![Dotclear](https://img.shields.io/badge/dotclear-v2.26-blue.svg)](https://fr.dotclear.org/download)
[![License](https://img.shields.io/github/license/JcDenis/httpPassword)](https://git.dotclear.watch/JcDenis/httpPassword/blob/master/LICENSE) [![Dotaddict](https://img.shields.io/badge/dotaddict-official-green.svg)](https://plugins.dotaddict.org/dc2/details/httpPassword)
[![License](https://img.shields.io/github/license/JcDenis/httpPassword)](https://github.com/JcDenis/httpPassword/blob/master/LICENSE)
## WHAT IS HTTPPASSWORD ? ## WHAT IS HTTPPASSWORD ?
@ -15,11 +16,11 @@ Its helps to manage .httppassword files to make a blog private.
## REQUIREMENTS ## REQUIREMENTS
_httpPassword_ requires: _httpPassword_ requires:
* Dotclear 2.27 * httpPassword permission to configure
* PHP 7.4+ * Dotclear 2.26
* Write permissions on blogs directories * Write permissions on blogs directories
## USAGE ## USAGE
@ -30,14 +31,14 @@ Manage settings, last logins, authorized users from sidebar menu _Http password_
## LINKS ## LINKS
* License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html) * License : [GNU GPL v2](https://www.gnu.org/licenses/old-licenses/lgpl-2.0.html)
* Source & contribution : [Gitea Page](https://git.dotclear.watch/JcDenis/httpPassword) or [GitHub Page](https://github.com/JcDenis/httpPassword) * Source & contribution : [GitHub Page](https://github.com/JcDenis/kUtRL)
* Packages & details: [Gitea Page](https://git.dotclear.watch/JcDenis/httpPassword/releases) or [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/httpPassword) * Packages & details: [Dotaddict Page](https://plugins.dotaddict.org/dc2/details/kUtRL)
* Discussion & Help: [Dotclear Forum](http://forum.dotclear.org/viewtopic.php?pid=331158) * Discussion & Help: [Dotclear Forum](http://forum.dotclear.org/viewtopic.php?pid=331158)
## CONTRIBUTORS ## CONTRIBUTORS
* Frederic PLE (author) * Frederic PLE (author)
* Jean-Christian Denis * Jean-Christian Denis
You are welcome to contribute to this code. You are welcome to contribute to this code.

15
_define.php
View File

@ -10,7 +10,7 @@
* @copyright Jean-Christian Denis * @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html * @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/ */
if (!defined('DC_RC_PATH')) { if (!defined('DC_RC_PATH') || is_null(dcCore::app()->auth)) {
return null; return null;
} }
@ -18,15 +18,16 @@ $this->registerModule(
'Http password', 'Http password',
'Manage .htpasswd file to make the blog private', 'Manage .htpasswd file to make the blog private',
'Frederic PLE and contributors', 'Frederic PLE and contributors',
'1.4', '1.3',
[ [
'requires' => [['core', '2.27']], 'requires' => [['core', '2.26']],
'permissions' => dcCore::app()->auth->makePermissions([ 'permissions' => dcCore::app()->auth->makePermissions([
dcCore::app()->auth::PERMISSION_ADMIN, dcCore::app()->auth::PERMISSION_USAGE,
initHttpPassword::PERMISSION,
]), ]),
'type' => 'plugin', 'type' => 'plugin',
'support' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/issues', 'support' => 'https://github.com/JcDenis/' . basename(__DIR__),
'details' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/src/branch/master/README.md', 'details' => 'http://plugins.dotaddict.org/dc2/details/' . basename(__DIR__),
'repository' => 'https://git.dotclear.watch/JcDenis/' . basename(__DIR__) . '/raw/branch/master/dcstore.xml', 'repository' => 'https://raw.githubusercontent.com/JcDenis/' . basename(__DIR__) . '/master/dcstore.xml',
] ]
); );

10
dcstore.xml
View File

@ -2,12 +2,12 @@
<modules xmlns:da="http://dotaddict.org/da/"> <modules xmlns:da="http://dotaddict.org/da/">
<module id="httpPassword"> <module id="httpPassword">
<name>Http password</name> <name>Http password</name>
<version>1.4</version> <version>1.3</version>
<author>Frederic PLE and contributors</author> <author>Frederic PLE and contributors</author>
<desc>Manage .htpasswd file to make the blog private</desc> <desc>Manage .htpasswd file to make the blog private</desc>
<file>https://git.dotclear.watch/JcDenis/httpPassword/releases/download/v1.4/plugin-httpPassword.zip</file> <file>https://github.com/JcDenis/httpPassword/releases/download/v1.3/plugin-httpPassword.zip</file>
<da:dcmin>2.27</da:dcmin> <da:dcmin>2.26</da:dcmin>
<da:details>https://git.dotclear.watch/JcDenis/httpPassword/src/branch/master/README.md</da:details> <da:details>http://plugins.dotaddict.org/dc2/details/httpPassword</da:details>
<da:support>https://git.dotclear.watch/JcDenis/httpPassword/issues</da:support> <da:support>https://github.com/JcDenis/httpPassword</da:support>
</module> </module>
</modules> </modules>

27
src/Backend.php
View File

@ -14,22 +14,39 @@ declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword; namespace Dotclear\Plugin\httpPassword;
use Dotclear\Core\Process; use dcAdmin;
use dcCore;
use dcPage;
use dcMenu;
use dcNsProcess;
class Backend extends Process class Backend extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
return self::status(My::checkContext(My::BACKEND)); static::$init = defined('DC_CONTEXT_ADMIN');
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::status()) { if (!static::$init || is_null(dcCore::app()->auth) || is_null(dcCore::app()->blog) || is_null(dcCore::app()->adminurl)) {
return false; return false;
} }
My::addBackendMenuItem(); // add backend sidebar menu icon
if ((dcCore::app()->menu[dcAdmin::MENU_PLUGINS] instanceof dcMenu)) {
dcCore::app()->menu[dcAdmin::MENU_PLUGINS]->addItem(
My::name(),
dcCore::app()->adminurl->get('admin.plugin.' . My::id()),
dcPage::getPF(My::id() . '/icon.svg'),
preg_match('/' . preg_quote(dcCore::app()->adminurl->get('admin.plugin.' . My::id())) . '(&.*)?$/', $_SERVER['REQUEST_URI']),
dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
My::PERMISSION,
]), dcCore::app()->blog->id)
);
}
return true; return true;
} }

10
src/Frontend.php
View File

@ -16,18 +16,20 @@ namespace Dotclear\Plugin\httpPassword;
use dcCore; use dcCore;
use dcLog; use dcLog;
use Dotclear\Core\Process; use dcNsProcess;
class Frontend extends Process class Frontend extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
return self::status(My::checkContext(My::FRONTEND)); static::$init = defined('DC_RC_PATH');
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::status() || !Utils::isActive()) { if (!static::$init || !Utils::isActive()) {
return false; return false;
} }

15
src/Install.php
View File

@ -15,25 +15,30 @@ declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword; namespace Dotclear\Plugin\httpPassword;
use dcCore; use dcCore;
use Dotclear\Core\Process; use dcNsProcess;
use Exception; use Exception;
class Install extends Process class Install extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
return self::status(My::checkContext(My::INSTALL)); if (defined('DC_CONTEXT_ADMIN')) {
$version = dcCore::app()->plugins->moduleInfo(My::id(), 'version');
static::$init = is_string($version) ? dcCore::app()->newVersion(My::id(), $version) : true;
}
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::status()) { if (!static::$init || is_null(dcCore::app()->blog)) {
return false; return false;
} }
try { try {
// Set settings // Set settings
$s = My::settings(); $s = dcCore::app()->blog->settings->get(My::id());
$s->put('active', false, 'boolean', 'Enable plugin', false, false); $s->put('active', false, 'boolean', 'Enable plugin', false, false);
$s->put('crypt', 'crypt_md5', 'string', 'Crypt algorithm', false, false); $s->put('crypt', 'crypt_md5', 'string', 'Crypt algorithm', false, false);
$s->put('message', 'Private space', 'String', 'Personalized message on Authentication popup', false, false); $s->put('message', 'Private space', 'String', 'Personalized message on Authentication popup', false, false);

95
src/Manage.php
View File

@ -15,11 +15,8 @@ declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword; namespace Dotclear\Plugin\httpPassword;
use dcCore; use dcCore;
use Dotclear\Core\Backend\{ use dcNsProcess;
Notices, use dcPage;
Page
};
use Dotclear\Core\Process;
use Dotclear\Helper\Date; use Dotclear\Helper\Date;
use Dotclear\Helper\Html\Html; use Dotclear\Helper\Html\Html;
use Dotclear\Helper\Html\Form\{ use Dotclear\Helper\Html\Form\{
@ -39,21 +36,30 @@ use Dotclear\Helper\Html\Form\{
/** /**
* Manage contributions list * Manage contributions list
*/ */
class Manage extends Process class Manage extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
return self::status(My::checkContext(My::MANAGE)); static::$init = defined('DC_CONTEXT_ADMIN')
&& !is_null(dcCore::app()->auth) && !is_null(dcCore::app()->blog) // nullsafe
&& dcCore::app()->auth->check(
dcCore::app()->auth->makePermissions([
My::PERMISSION,
]),
dcCore::app()->blog->id
);
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::status() || is_null(dcCore::app()->blog)) { if (!static::$init || is_null(dcCore::app()->blog) || is_null(dcCore::app()->adminurl)) {
return false; return false;
} }
if (!Utils::isWritable()) { if (!Utils::isWritable()) {
Notices::addWarningNotice( dcPage::addWarningNotice(
__('No write permissions on blogs directories.') __('No write permissions on blogs directories.')
); );
} }
@ -66,18 +72,21 @@ class Manage extends Process
// save settings // save settings
if ('savesettings' == $action) { if ('savesettings' == $action) {
$s = My::settings(); $s = dcCore::app()->blog->settings->get(My::id());
$s->put('active', !empty($_POST['active'])); $s->put('active', !empty($_POST['active']));
$s->put('crypt', in_array((string) $_POST['crypt'], My::cryptCombo()) ? $_POST['crypt'] : 'paintext'); $s->put('crypt', in_array((string) $_POST['crypt'], My::cryptCombo()) ? $_POST['crypt'] : 'paintext');
$s->put('message', (string) $_POST['message']); $s->put('message', (string) $_POST['message']);
dcCore::app()->blog->triggerBlog(); dcCore::app()->blog->triggerBlog();
Notices::addSuccessNotice( dcPage::addSuccessNotice(
__('Settings successfully updated.') __('Settings successfully updated.')
); );
My::redirect(['part' => $part]); dcCore::app()->adminurl->redirect(
'admin.plugin.' . My::id(),
['part' => $part]
);
} }
// delete users logins // delete users logins
@ -90,11 +99,14 @@ class Manage extends Process
} }
$logs = dcCore::app()->log->delLogs($ids); $logs = dcCore::app()->log->delLogs($ids);
Notices::addSuccessNotice( dcPage::addSuccessNotice(
__('Logs successfully cleared.') __('Logs successfully cleared.')
); );
My::redirect(['part' => $part]); dcCore::app()->adminurl->redirect(
'admin.plugin.' . My::id(),
['part' => $part]
);
} }
} }
@ -132,11 +144,14 @@ class Manage extends Process
dcCore::app()->blog->triggerBlog(); dcCore::app()->blog->triggerBlog();
Notices::addSuccessNotice( dcPage::addSuccessNotice(
__('Logins successfully updated.') __('Logins successfully updated.')
); );
My::redirect(['part' => $part]); dcCore::app()->adminurl->redirect(
'admin.plugin.' . My::id(),
['part' => $part]
);
} }
return true; return true;
@ -144,33 +159,33 @@ class Manage extends Process
public static function render(): void public static function render(): void
{ {
if (!self::status() || is_null(dcCore::app()->blog)) { if (!static::$init || is_null(dcCore::app()->blog) || is_null(dcCore::app()->adminurl)) {
return; return;
} }
$part = self::getSection(); $part = self::getSection();
Page::openModule( dcPage::openModule(
My::name(), My::name(),
Page::jsPageTabs() . dcPage::jsPageTabs() .
My::jsLoad('backend') dcPage::jsModuleLoad(My::id() . '/js/backend.js')
); );
echo echo
Page::breadcrumb([ dcPage::breadcrumb([
__('Plugins') => '', __('Plugins') => '',
My::name() => My::manageUrl(), My::name() => dcCore::app()->adminurl->get('admin.plugin.' . My::id()),
array_search($part, My::sectionCombo()) => '', array_search($part, My::sectionCombo()) => '',
]) . ]) .
Notices::getNotices() . dcPage::notices() .
// Filters select menu list // Filters select menu list
(new Form('section_menu'))->action(My::manageUrl())->method('get')->fields([ (new Form('section_menu'))->action(dcCore::app()->adminurl->get('admin.plugin.' . My::id()))->method('get')->fields([
(new Para())->class('anchor-nav')->items([ (new Para())->class('anchor-nav')->items([
(new Label(__('Select section:')))->for('part')->class('classic'), (new Label(__('Select section:')))->for('part')->class('classic'),
(new Select('part'))->default($part)->items(My::sectionCombo()), (new Select('part'))->default($part)->items(My::sectionCombo()),
(new Submit(['go']))->value(__('Ok')), (new Submit(['go']))->value(__('Ok')),
... My::hiddenFields(), (new Hidden(['p'], My::id())),
]), ]),
])->render() . ])->render() .
@ -179,7 +194,7 @@ class Manage extends Process
// settigns form // settigns form
if ('settings' == $part) { if ('settings' == $part) {
echo echo
(new Form('section_settings'))->action(My::manageUrl())->method('post')->fields([ (new Form('section_settings'))->action(dcCore::app()->adminurl->get('admin.plugin.' . My::id(), ['part' => 'settings']))->method('post')->fields([
// active // active
(new Para())->items([ (new Para())->items([
(new Checkbox('active', Utils::isActive()))->value(1), (new Checkbox('active', Utils::isActive()))->value(1),
@ -200,7 +215,8 @@ class Manage extends Process
(new Div())->class('clear')->items([ (new Div())->class('clear')->items([
(new Submit(['save']))->value(__('Save')), (new Submit(['save']))->value(__('Save')),
(new Hidden(['action'], 'savesettings')), (new Hidden(['action'], 'savesettings')),
... My::hiddenFields(['part' => $part]), (new Hidden(['part'], $part)),
dcCore::app()->formNonce(false),
]), ]),
])->render(); ])->render();
} }
@ -213,13 +229,12 @@ class Manage extends Process
'<p>' . __('Logins history is empty.') . '</p>'; '<p>' . __('Logins history is empty.') . '</p>';
} else { } else {
echo echo
(new Form('section_logins'))->action(My::manageUrl())->method('post')->fields([ (new Form('section_logins'))->action(dcCore::app()->adminurl->get('admin.plugin.' . My::id(), ['part' => 'logins']))->method('post')->fields([
(new Para())->items([ (new Para())->items([
(new Submit(['save']))->value(__('Clear logs')), (new Submit(['save']))->value(__('Clear logs')),
... My::hiddenFields([ (new Hidden(['action'], 'savelogins')),
'action' => 'savelogins', (new Hidden(['part'], $part)),
'part' => $part, dcCore::app()->formNonce(false),
]),
]), ]),
])->render() . ])->render() .
@ -270,7 +285,7 @@ class Manage extends Process
} }
echo echo
(new Form('section_passwords'))->action(My::manageUrl())->method('post')->fields([ (new Form('section_passwords'))->action(dcCore::app()->adminurl->get('admin.plugin.' . My::id(), ['part' => $part]))->method('post')->fields([
(new Text( (new Text(
'', '',
'<div class="table-outer"><table>' . '<div class="table-outer"><table>' .
@ -285,14 +300,15 @@ class Manage extends Process
)), )),
(new Para())->items([ (new Para())->items([
(new Hidden(['action'], 'savepasswords')), (new Hidden(['action'], 'savepasswords')),
... My::hiddenFields(['part' => $part]), (new Hidden(['part'], $part)),
dcCore::app()->formNonce(false),
]), ]),
])->render(); ])->render();
} }
// new login form // new login form
echo echo
(new Form('section_new'))->action(My::manageUrl())->method('post')->fields([ (new Form('section_new'))->action(dcCore::app()->adminurl->get('admin.plugin.' . My::id(), ['part' => $part]))->method('post')->fields([
(new Text('h3', Html::escapeHTML(__('Add a user')))), (new Text('h3', Html::escapeHTML(__('Add a user')))),
// login // login
(new Para())->items([ (new Para())->items([
@ -306,15 +322,14 @@ class Manage extends Process
]), ]),
(new Para())->items([ (new Para())->items([
(new Submit(['add']))->value(__('Save')), (new Submit(['add']))->value(__('Save')),
... My::hiddenFields([ (new Hidden(['action'], 'savepasswords')),
'action' => 'savepasswords', (new Hidden(['part'], $part)),
'part' => $part, dcCore::app()->formNonce(false),
]),
]), ]),
])->render(); ])->render();
} }
Page::closeModule(); dcPage::closeModule();
} }
/** /**

33
src/My.php
View File

@ -14,16 +14,45 @@ declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword; namespace Dotclear\Plugin\httpPassword;
use Dotclear\Module\MyPlugin; use dcCore;
/** /**
* This module definitions. * This module definitions.
*/ */
class My extends MyPlugin class My
{ {
/** @var string This plugin permissions */
public const PERMISSION = 'httpPassword';
/** @var string Passwords file name */ /** @var string Passwords file name */
public const FILE_PASSWORD = '.htpasswd'; public const FILE_PASSWORD = '.htpasswd';
/**
* This module id.
*/
public static function id(): string
{
return basename(dirname(__DIR__));
}
/**
* This module name.
*/
public static function name(): string
{
$name = dcCore::app()->plugins->moduleInfo(self::id(), 'name');
return __(is_string($name) ? $name : self::id());
}
/**
* This module path.
*/
public static function path(): string
{
return dirname(__DIR__);
}
/** /**
* Encryption methods combo. * Encryption methods combo.
* *

43
src/Prepend.php 100644
View File

@ -0,0 +1,43 @@
<?php
/**
* @brief httpPassword, a plugin for Dotclear 2
*
* @package Dotclear
* @subpackage Plugin
*
* @author Frederic PLE and contributors
*
* @copyright Jean-Christian Denis
* @copyright GPL-2.0 https://www.gnu.org/licenses/gpl-2.0.html
*/
declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword;
use dcCore;
use dcNsProcess;
class Prepend extends dcNsProcess
{
public static function init(): bool
{
static::$init = true;
return static::$init;
}
public static function process(): bool
{
if (!static::$init || is_null(dcCore::app()->auth)) {
return false;
}
// register module permission
dcCore::app()->auth->setPermissionType(
My::PERMISSION,
__('Manage http password blog protection')
);
return true;
}
}

10
src/Uninstall.php
View File

@ -15,19 +15,21 @@ declare(strict_types=1);
namespace Dotclear\Plugin\httpPassword; namespace Dotclear\Plugin\httpPassword;
use dcCore; use dcCore;
use Dotclear\Core\Process; use dcNsProcess;
use Dotclear\Plugin\Uninstaller\Uninstaller; use Dotclear\Plugin\Uninstaller\Uninstaller;
class Uninstall extends Process class Uninstall extends dcNsProcess
{ {
public static function init(): bool public static function init(): bool
{ {
return self::status(My::checkContext(My::UNINSTALL)); static::$init = defined('DC_CONTEXT_ADMIN');
return static::$init;
} }
public static function process(): bool public static function process(): bool
{ {
if (!self::status() || !dcCore::app()->plugins->moduleExists('Uninstaller')) { if (!static::$init || !dcCore::app()->plugins->moduleExists('Uninstaller')) {
return false; return false;
} }

6
src/Utils.php
View File

@ -88,7 +88,7 @@ class Utils
*/ */
public static function isActive(): bool public static function isActive(): bool
{ {
return (bool) My::settings()->get('active'); return !is_null(dcCore::app()->blog) && (bool) dcCore::app()->blog->settings->get(My::id())->get('active');
} }
/** /**
@ -98,7 +98,7 @@ class Utils
*/ */
public static function cryptMethod(): string public static function cryptMethod(): string
{ {
return is_string(My::settings()->get('crypt')) ? My::settings()->get('crypt') : ''; return !is_null(dcCore::app()->blog) && is_string(dcCore::app()->blog->settings->get(My::id())->get('crypt')) ? dcCore::app()->blog->settings->get(My::id())->get('crypt') : '';
} }
/** /**
@ -108,7 +108,7 @@ class Utils
*/ */
public static function httpMessage(): string public static function httpMessage(): string
{ {
return is_string(My::settings()->get('message')) ? My::settings()->get('message') : ''; return !is_null(dcCore::app()->blog) && is_string(dcCore::app()->blog->settings->get(My::id())->get('message')) ? dcCore::app()->blog->settings->get(My::id())->get('message') : '';
} }
/** /**