cosmetic nullsafe fix

This commit is contained in:
Jean-Christian Paul Denis 2023-04-20 23:26:52 +02:00
parent 6719bac9a8
commit f37223df94
Signed by: JcDenis
GPG Key ID: 1B5B8C5B90B6C951
4 changed files with 21 additions and 1 deletions

View File

@ -37,6 +37,7 @@ class Backend extends dcNsProcess
{ {
static::$init = defined('DC_CONTEXT_ADMIN') static::$init = defined('DC_CONTEXT_ADMIN')
&& My::phpCompliant() && My::phpCompliant()
&& !is_null(dcCore::app()->auth) && !is_null(dcCore::app()->blog) // nullsafe PHP < 8.0
&& dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([ && dcCore::app()->auth->check(dcCore::app()->auth->makePermissions([
dcCore::app()->auth::PERMISSION_CONTENT_ADMIN, dcCore::app()->auth::PERMISSION_CONTENT_ADMIN,
]), dcCore::app()->blog->id); ]), dcCore::app()->blog->id);
@ -69,6 +70,10 @@ class Backend extends dcNsProcess
}, },
'adminBlogPreferencesHeaders' => function (): string { 'adminBlogPreferencesHeaders' => function (): string {
// nullsafe PHP < 8.0
if (is_null(dcCore::app()->auth)) {
return '';
}
$editor = dcCore::app()->auth->getOption('editor'); $editor = dcCore::app()->auth->getOption('editor');
return return
@ -111,7 +116,7 @@ class Backend extends dcNsProcess
(new Div())->class('clear')->items([ (new Div())->class('clear')->items([
(new Para())->items([ (new Para())->items([
(new Label(__('Disclaimer:'), Label::OUTSIDE_LABEL_BEFORE))->for('disclaimer_text'), (new Label(__('Disclaimer:'), Label::OUTSIDE_LABEL_BEFORE))->for('disclaimer_text'),
(new Textarea('disclaimer_text', Html::escapeHTML((string) $s->get('disclaimer_text'))))->cols(60)->rows(5)->lang(dcCore::app()->blog->settings->get('system')->get('lang'))->spellcheck(true), (new Textarea('disclaimer_text', Html::escapeHTML((string) $s->get('disclaimer_text'))))->cols(60)->rows(5)->lang($blog_settings->get('system')->get('lang'))->spellcheck(true),
]), ]),
(new Para())->items([ (new Para())->items([
(new Label(__('List of robots allowed to index the site pages (separated by semicolons):')))->for('disclaimer_bots_agents'), (new Label(__('List of robots allowed to index the site pages (separated by semicolons):')))->for('disclaimer_bots_agents'),

View File

@ -34,6 +34,11 @@ class Frontend extends dcNsProcess
return false; return false;
} }
// nullsafe PHP < 8.0
if (is_null(dcCore::app()->blog)) {
return false;
}
# Is active # Is active
if (!dcCore::app()->blog->settings->get(My::id())->get('disclaimer_active')) { if (!dcCore::app()->blog->settings->get(My::id())->get('disclaimer_active')) {
return false; return false;

View File

@ -35,6 +35,11 @@ class Install extends dcNsProcess
return false; return false;
} }
// nullsafe PHP < 8.0
if (is_null(dcCore::app()->blog)) {
return false;
}
// Module specs // Module specs
$mod_conf = [ $mod_conf = [
[ [

View File

@ -45,6 +45,11 @@ class UrlHandler extends dcUrlHandlers
*/ */
public static function publicBeforeDocumentV2(): void public static function publicBeforeDocumentV2(): void
{ {
// nullsafe PHP < 8.0
if (is_null(dcCore::app()->blog)) {
return;
}
$s = dcCore::app()->blog->settings->get(My::id()); $s = dcCore::app()->blog->settings->get(My::id());
# Test user-agent to see if it is a bot # Test user-agent to see if it is a bot