mirror of
https://github.com/friendica/friendica
synced 2025-03-04 11:48:26 +00:00
Implement photo_upload_form hook as Event
This commit is contained in:
parent
f4624b0591
commit
7298ad29c1
4 changed files with 57 additions and 47 deletions
|
@ -12,12 +12,12 @@ use Friendica\Content\Pager;
|
||||||
use Friendica\Content\Text\BBCode;
|
use Friendica\Content\Text\BBCode;
|
||||||
use Friendica\Core\ACL;
|
use Friendica\Core\ACL;
|
||||||
use Friendica\Core\Addon;
|
use Friendica\Core\Addon;
|
||||||
use Friendica\Core\Hook;
|
|
||||||
use Friendica\Core\Renderer;
|
use Friendica\Core\Renderer;
|
||||||
use Friendica\Core\System;
|
use Friendica\Core\System;
|
||||||
use Friendica\Database\DBA;
|
use Friendica\Database\DBA;
|
||||||
use Friendica\Database\DBStructure;
|
use Friendica\Database\DBStructure;
|
||||||
use Friendica\DI;
|
use Friendica\DI;
|
||||||
|
use Friendica\Event\ArrayFilterEvent;
|
||||||
use Friendica\Model\Contact;
|
use Friendica\Model\Contact;
|
||||||
use Friendica\Model\Item;
|
use Friendica\Model\Item;
|
||||||
use Friendica\Model\Photo;
|
use Friendica\Model\Photo;
|
||||||
|
@ -648,7 +648,11 @@ function photos_content()
|
||||||
'default_upload' => true
|
'default_upload' => true
|
||||||
];
|
];
|
||||||
|
|
||||||
Hook::callAll('photo_upload_form', $ret);
|
$eventDispatcher = DI::eventDispatcher();
|
||||||
|
|
||||||
|
$eventDispatcher->dispatch(
|
||||||
|
new ArrayFilterEvent(ArrayFilterEvent::PHOTO_UPLOAD_FORM, $ret)
|
||||||
|
);
|
||||||
|
|
||||||
$default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
|
$default_upload_box = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_box.tpl'), []);
|
||||||
$default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
|
$default_upload_submit = Renderer::replaceMacros(Renderer::getMarkupTemplate('photos_default_uploader_submit.tpl'), [
|
||||||
|
|
|
@ -44,6 +44,7 @@ final class HookEventBridge
|
||||||
ArrayFilterEvent::POST_LOCAL_START => 'post_local_start',
|
ArrayFilterEvent::POST_LOCAL_START => 'post_local_start',
|
||||||
ArrayFilterEvent::POST_LOCAL => 'post_local',
|
ArrayFilterEvent::POST_LOCAL => 'post_local',
|
||||||
ArrayFilterEvent::POST_LOCAL_END => 'post_local_end',
|
ArrayFilterEvent::POST_LOCAL_END => 'post_local_end',
|
||||||
|
ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'photo_upload_form',
|
||||||
HtmlFilterEvent::HEAD => 'head',
|
HtmlFilterEvent::HEAD => 'head',
|
||||||
HtmlFilterEvent::FOOTER => 'footer',
|
HtmlFilterEvent::FOOTER => 'footer',
|
||||||
HtmlFilterEvent::PAGE_HEADER => 'page_header',
|
HtmlFilterEvent::PAGE_HEADER => 'page_header',
|
||||||
|
@ -67,6 +68,7 @@ final class HookEventBridge
|
||||||
ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
|
||||||
ArrayFilterEvent::POST_LOCAL => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL => 'onArrayFilterEvent',
|
||||||
ArrayFilterEvent::POST_LOCAL_END => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL_END => 'onArrayFilterEvent',
|
||||||
|
ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
|
||||||
HtmlFilterEvent::HEAD => 'onHtmlFilterEvent',
|
HtmlFilterEvent::HEAD => 'onHtmlFilterEvent',
|
||||||
HtmlFilterEvent::FOOTER => 'onHtmlFilterEvent',
|
HtmlFilterEvent::FOOTER => 'onHtmlFilterEvent',
|
||||||
HtmlFilterEvent::PAGE_HEADER => 'onHtmlFilterEvent',
|
HtmlFilterEvent::PAGE_HEADER => 'onHtmlFilterEvent',
|
||||||
|
|
|
@ -30,6 +30,8 @@ final class ArrayFilterEvent extends Event
|
||||||
|
|
||||||
public const POST_LOCAL_END = 'friendica.data.post_local_end';
|
public const POST_LOCAL_END = 'friendica.data.post_local_end';
|
||||||
|
|
||||||
|
public const PHOTO_UPLOAD_FORM = 'friendica.data.photo_upload_form';
|
||||||
|
|
||||||
private array $array;
|
private array $array;
|
||||||
|
|
||||||
public function __construct(string $name, array $array)
|
public function __construct(string $name, array $array)
|
||||||
|
|
|
@ -32,6 +32,7 @@ class HookEventBridgeTest extends TestCase
|
||||||
ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL_START => 'onArrayFilterEvent',
|
||||||
ArrayFilterEvent::POST_LOCAL => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL => 'onArrayFilterEvent',
|
||||||
ArrayFilterEvent::POST_LOCAL_END => 'onArrayFilterEvent',
|
ArrayFilterEvent::POST_LOCAL_END => 'onArrayFilterEvent',
|
||||||
|
ArrayFilterEvent::PHOTO_UPLOAD_FORM => 'onArrayFilterEvent',
|
||||||
HtmlFilterEvent::HEAD => 'onHtmlFilterEvent',
|
HtmlFilterEvent::HEAD => 'onHtmlFilterEvent',
|
||||||
HtmlFilterEvent::FOOTER => 'onHtmlFilterEvent',
|
HtmlFilterEvent::FOOTER => 'onHtmlFilterEvent',
|
||||||
HtmlFilterEvent::PAGE_HEADER => 'onHtmlFilterEvent',
|
HtmlFilterEvent::PAGE_HEADER => 'onHtmlFilterEvent',
|
||||||
|
@ -127,6 +128,7 @@ class HookEventBridgeTest extends TestCase
|
||||||
[ArrayFilterEvent::POST_LOCAL_START, 'post_local_start'],
|
[ArrayFilterEvent::POST_LOCAL_START, 'post_local_start'],
|
||||||
[ArrayFilterEvent::POST_LOCAL, 'post_local'],
|
[ArrayFilterEvent::POST_LOCAL, 'post_local'],
|
||||||
[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
|
[ArrayFilterEvent::POST_LOCAL_END, 'post_local_end'],
|
||||||
|
[ArrayFilterEvent::PHOTO_UPLOAD_FORM, 'photo_upload_form'],
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue