mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-05 07:57:46 +02:00
Code Issues Releases Wiki Activity

fix(em): prevent use if missing php functions

Browse Source
This commit is contained in:
Sami Mazouz
2024-11-29 14:38:31 +01:00
parent 9920a9f2f0
commit 94b0d67a40
4 changed files with 40 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
extensions/package-manager/extend.php
View File

@@ -46,6 +46,11 @@ return [
&& is_writable($paths->base.'/composer.lock');
$document->payload['flarum-extension-manager.using_sync_queue'] = resolve(Queue::class) instanceof SyncQueue;
$document->payload['flarum-extension-manager.missing_functions'] = array_values(array_filter(
['proc_open', 'escapeshellarg'],
fn (string $function): bool => ! function_exists($function)
));
}),
new Extend\Locales(__DIR__.'/locale'),

18
extensions/package-manager/js/src/admin/components/ControlSection.tsx
View File

@@ -1,6 +1,4 @@
import app from 'flarum/admin/app';
import Component from 'flarum/common/Component';
import Alert from 'flarum/common/components/Alert';
import { ComponentAttrs } from 'flarum/common/Component';
import Installer from './Installer';
@@ -17,18 +15,10 @@ export default class ControlSection extends Component<ComponentAttrs> {
return (
<div className="ExtensionPage-settings ExtensionManager-controlSection">
<div className="container">
{app.data['flarum-extension-manager.writable_dirs'] ? (
<Form>
<Installer />
<Updater />
</Form>
) : (
<div className="Form-group">
<Alert type="warning" dismissible={false}>
{app.translator.trans('flarum-extension-manager.admin.file_permissions')}
</Alert>
</div>
)}
<Form>
<Installer />
<Updater />
</Form>
</div>
</div>
);

29
extensions/package-manager/js/src/admin/components/SettingsPage.tsx
View File

@@ -8,6 +8,7 @@ import ControlSection from './ControlSection';
import ConfigureComposer from './ConfigureComposer';
import ConfigureAuth from './ConfigureAuth';
import DiscoverSection from './DiscoverSection';
import Alert from 'flarum/common/components/Alert';
export default class SettingsPage extends ExtensionPage {
content() {
@@ -43,9 +44,33 @@ export default class SettingsPage extends ExtensionPage {
sections(vnode: Mithril.VnodeDOM<ExtensionPageAttrs, this>): ItemList<unknown> {
const items = super.sections(vnode);
items.add('discover', <DiscoverSection />, 15);
const writableDirs = app.data['flarum-extension-manager.writable_dirs'];
const missingFunctions = app.data['flarum-extension-manager.missing_functions'] as string[] | undefined;
const usable = writableDirs && (!missingFunctions || missingFunctions.length === 0);
items.add('control', <ControlSection />, 10);
if (usable) {
items.add('discover', <DiscoverSection />, 15);
items.add('control', <ControlSection />, 10);
} else {
items.add(
'warning',
<div className="ExtensionPage-settings">
<div className="container">
<div className="Form-group">
<Alert type="error" dismissible={false}>
{!app.data['flarum-extension-manager.writable_dirs']
? app.translator.trans('flarum-extension-manager.admin.file_permissions')
: app.translator.trans('flarum-extension-manager.admin.required_php_functions', {
functions: (app.data['flarum-extension-manager.missing_functions'] as string[]).join(', '),
})}
</Alert>
</div>
</div>
</div>,
10
);
}
items.setPriority('content', 8);

4
extensions/package-manager/locale/en.yml
View File

@@ -99,6 +99,10 @@ flarum-extension-manager:
minor_update_confirmation:
content: This will also update any other extensions/packages with available updates.
required_php_functions: >
The extension manager requires the following PHP functions to be enabled: <code>{functions}</code>.
If you do not have access to the PHP configuration, please contact your hosting provider.
sections:
discover:
description: Add new features and integrations to your Flarum forum with extensions.