Skip to content

Update code #111

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 28, 2025
Merged

Update code #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4475788
Fix bbcode faq example
iMattPro May 28, 2025
4cc89f9
Update demo youtube URL
iMattPro May 28, 2025
39b4916
Remove yucky XHTML
iMattPro May 28, 2025
f0debe7
Fix whitespacing issue
iMattPro May 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions adm/style/acp_phpbb_mediaembed_manage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ <h3>{{ lang('WARNING') }}</h3>
<td style="width: 25%;">
{% if site %}
<label style="font-size: 1em;" title="{{ site.title }}">
<input type="checkbox" class="radio" name="mark[]" value="{{ site.id }}"{% if site.disabled %} disabled{% elseif site.enabled %} checked{% endif %} /> {{ site.name }}
<input type="checkbox" class="radio" name="mark[]" value="{{ site.id }}"{% if site.disabled %} disabled{% elseif site.enabled %} checked{% endif %}> {{ site.name }}
</label>
{% endif %}
</td>
Expand All @@ -38,8 +38,8 @@ <h3>{{ lang('WARNING') }}</h3>
<p class="small"><a href="#" data-marksites="true">{{ lang('MARK_ALL') }}</a> &bull; <a href="#" data-marksites="false">{{ lang('UNMARK_ALL') }}</a></p>
</fieldset>
<p id="buttons" class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}">
</p>
{{ S_FORM_TOKEN }}
</form>
Expand Down
40 changes: 20 additions & 20 deletions adm/style/acp_phpbb_mediaembed_settings.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,51 +8,51 @@ <h1>{{ lang('ACP_MEDIA_SETTINGS') }}</h1>
<fieldset>
<legend>{{ lang('ACP_MEDIA_BBCODE_LEGEND') }}</legend>
<dl>
<dt><label for="media_embed_bbcode">{{ lang('ACP_MEDIA_DISPLAY_BBCODE') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_DISPLAY_BBCODE_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_bbcode" id="media_embed_bbcode" value="1" {% if S_MEDIA_EMBED_BBCODE %}checked="checked"{% endif %}/> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_bbcode" value="0"{% if not S_MEDIA_EMBED_BBCODE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
<dt><label for="media_embed_bbcode">{{ lang('ACP_MEDIA_DISPLAY_BBCODE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_DISPLAY_BBCODE_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_bbcode" id="media_embed_bbcode" value="1" {% if S_MEDIA_EMBED_BBCODE %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_bbcode" value="0"{% if not S_MEDIA_EMBED_BBCODE %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
</dl>
</fieldset>
<fieldset>
<legend>{{ lang('ACP_MEDIA_OPTIONS_LEGEND') }}</legend>
<dl>
<dt><label for="media_embed_allow_sig">{{ lang('ACP_MEDIA_ALLOW_SIG') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_ALLOW_SIG_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_allow_sig" id="media_embed_allow_sig" value="1" {% if S_MEDIA_EMBED_ALLOW_SIG %}checked="checked"{% endif %}/> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_allow_sig" value="0"{% if not S_MEDIA_EMBED_ALLOW_SIG %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
<dt><label for="media_embed_allow_sig">{{ lang('ACP_MEDIA_ALLOW_SIG') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_ALLOW_SIG_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_allow_sig" id="media_embed_allow_sig" value="1" {% if S_MEDIA_EMBED_ALLOW_SIG %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_allow_sig" value="0"{% if not S_MEDIA_EMBED_ALLOW_SIG %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
</dl>
<dl>
<dt><label for="media_embed_parse_urls">{{ lang('ACP_MEDIA_PARSE_URLS') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_PARSE_URLS_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_parse_urls" id="media_embed_parse_urls" value="1" {% if S_MEDIA_EMBED_PARSE_URLS %}checked="checked"{% endif %}/> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_parse_urls" value="0"{% if not S_MEDIA_EMBED_PARSE_URLS %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
<dt><label for="media_embed_parse_urls">{{ lang('ACP_MEDIA_PARSE_URLS') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_PARSE_URLS_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_parse_urls" id="media_embed_parse_urls" value="1" {% if S_MEDIA_EMBED_PARSE_URLS %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_parse_urls" value="0"{% if not S_MEDIA_EMBED_PARSE_URLS %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
</dl>
</fieldset>
<fieldset>
<legend>{{ lang('ACP_MEDIA_CACHE_LEGEND') }}</legend>
<dl>
<dt><label for="media_embed_enable_cache">{{ lang('ACP_MEDIA_ENABLE_CACHE') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_ENABLE_CACHE_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_enable_cache" id="media_embed_enable_cache" value="1" {% if S_MEDIA_EMBED_ENABLE_CACHE %}checked="checked"{% endif %}/> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_enable_cache" value="0"{% if not S_MEDIA_EMBED_ENABLE_CACHE %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
<dt><label for="media_embed_enable_cache">{{ lang('ACP_MEDIA_ENABLE_CACHE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_ENABLE_CACHE_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_enable_cache" id="media_embed_enable_cache" value="1" {% if S_MEDIA_EMBED_ENABLE_CACHE %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_enable_cache" value="0"{% if not S_MEDIA_EMBED_ENABLE_CACHE %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
</dl>
<dl>
<dt><label for="action_purge_cache">{{ lang('ACP_MEDIA_PURGE_CACHE') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_PURGE_CACHE_EXPLAIN') }}</span></dt>
<dd><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{{ lang('PURGE_CACHE') }}" /></dd>
<dt><label for="action_purge_cache">{{ lang('ACP_MEDIA_PURGE_CACHE') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_PURGE_CACHE_EXPLAIN') }}</span></dt>
<dd><input class="button2" type="submit" id="action_purge_cache" name="action_purge_cache" value="{{ lang('PURGE_CACHE') }}"></dd>
</dl>
</fieldset>
<fieldset>
<legend>{{ lang('ACP_MEDIA_WIDTH_LEGEND') }}</legend>
<dl>
<dt><label for="media_embed_full_width">{{ lang('ACP_MEDIA_FULL_WIDTH') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_FULL_WIDTH_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_full_width" id="media_embed_full_width" value="1" {% if S_MEDIA_EMBED_FULL_WIDTH %}checked="checked"{% endif %}/> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_full_width" value="0"{% if not S_MEDIA_EMBED_FULL_WIDTH %} checked="checked"{% endif %} /> {{ lang('NO') }}</label></dd>
<dt><label for="media_embed_full_width">{{ lang('ACP_MEDIA_FULL_WIDTH') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_FULL_WIDTH_EXPLAIN') }}</span></dt>
<dd><label><input type="radio" class="radio" name="media_embed_full_width" id="media_embed_full_width" value="1" {% if S_MEDIA_EMBED_FULL_WIDTH %}checked="checked"{% endif %}> {{ lang('YES') }}</label>
<label><input type="radio" class="radio" name="media_embed_full_width" value="0"{% if not S_MEDIA_EMBED_FULL_WIDTH %} checked="checked"{% endif %}> {{ lang('NO') }}</label></dd>
</dl>
<dl>
<dt><label for="media_embed_max_width">{{ lang('ACP_MEDIA_MAX_WIDTH') ~ lang('COLON') }}</label><br /><span>{{ lang('ACP_MEDIA_MAX_WIDTH_EXPLAIN') }}</span></dt>
<dt><label for="media_embed_max_width">{{ lang('ACP_MEDIA_MAX_WIDTH') ~ lang('COLON') }}</label><br><span>{{ lang('ACP_MEDIA_MAX_WIDTH_EXPLAIN') }}</span></dt>
<dd><textarea id="media_embed_max_width" name="media_embed_max_width" rows="8" cols="40" style="width: 50%;" placeholder="twitter:100%&#10;youtube:80%&#10;funnyordie:480px">{{ S_MEDIA_EMBED_MAX_WIDTHS }}</textarea></dd>
</dl>
</fieldset>
<fieldset class="submit-buttons">
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}" />&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}" />
<input class="button1" type="submit" id="submit" name="submit" value="{{ lang('SUBMIT') }}">&nbsp;
<input class="button2" type="reset" id="reset" name="reset" value="{{ lang('RESET') }}">
{{ S_FORM_TOKEN }}
</fieldset>
</form>
Expand Down
2 changes: 1 addition & 1 deletion adm/style/event/acp_posting_buttons_custom_tags_before.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% if S_BBCODE_MEDIA %}
<input type="button" class="button2" accesskey="m" name="addmedia" value="Media" style="width: 50px;" onclick="bbfontstyle('[media]', '[/media]');" title="{{ lang('BBCODE_MEDIA_HELP') }}" />
<input type="button" class="button2" accesskey="m" name="addmedia" value="Media" style="width: 50px;" onclick="bbfontstyle('[media]', '[/media]');" title="{{ lang('BBCODE_MEDIA_HELP') }}">
{% endif %}
21 changes: 12 additions & 9 deletions event/main_listener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@
*/
class main_listener implements EventSubscriberInterface
{
/** @var string A link to a rich content media site for demo purposes */
public const MEDIA_DEMO_URL = 'https://youtu.be/Ne18ZQ7LLI0';

/** @var auth */
protected $auth;

Expand Down Expand Up @@ -73,13 +76,13 @@ public static function getSubscribedEvents()
/**
* Constructor
*
* @param auth $auth
* @param config $config
* @param db_text $config_text
* @param language $language
* @param template $template
* @param customsitescollection $custom_sites
* @param string $cache_dir
* @param auth $auth
* @param config $config
* @param db_text $config_text
* @param language $language
* @param template $template
* @param customsitescollection $custom_sites
* @param string $cache_dir
*/
public function __construct(auth $auth, config $config, db_text $config_text, language $language, template $template, customsitescollection $custom_sites, $cache_dir)
{
Expand Down Expand Up @@ -193,14 +196,14 @@ public function media_embed_help($event)
]);

$uid = $bitfield = $flags = '';
$demo_text = $this->language->lang('HELP_EMBEDDING_MEDIA_DEMO');
$demo_text = self::MEDIA_DEMO_URL;
generate_text_for_storage($demo_text, $uid, $bitfield, $flags, true, true);
$demo_display = generate_text_for_display($demo_text, $uid, $bitfield, $flags);
$list_sites = implode(', ', $this->get_siteIds());

$this->template->assign_block_vars('faq_block.faq_row', [
'FAQ_QUESTION' => $this->language->lang('HELP_EMBEDDING_MEDIA_QUESTION'),
'FAQ_ANSWER' => $this->language->lang('HELP_EMBEDDING_MEDIA_ANSWER', $demo_text, $demo_display, $list_sites),
'FAQ_ANSWER' => $this->language->lang('HELP_EMBEDDING_MEDIA_ANSWER', self::MEDIA_DEMO_URL, $demo_display, $list_sites),
]);
}
}
Expand Down
11 changes: 5 additions & 6 deletions language/ar/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,13 @@
'HELP_EMBEDDING_MEDIA_QUESTION' => 'كيف أستطيع إدراج مُحتوى الوسائط من المواقع الأخرى في المُشاركات؟',
'HELP_EMBEDDING_MEDIA_ANSWER' => 'يستطيع الأعضاء إدراج محتوى الوسائط مثل الفيديو والمقاطع الصوتية من المواقع المسموح بها بإستخدام
الوسم <strong>[media][/media]</strong>, أو ببساطة كتابة الرابط لأحد المواقع المدعومة
كما هو بدون الوسوم. مثال:<br /><br />
كما هو بدون الوسوم. مثال:<br><br>
<strong>[media]</strong>%1$s<strong>[/media]</strong>
<br /><br />كما تلاحظ في المثال أعلاه, تستطيع أيضاً استخدام الرابط بدون الوسم
<br><br>كما تلاحظ في المثال أعلاه, تستطيع أيضاً استخدام الرابط بدون الوسم
<strong>[media]</strong>.
<br /><br />ستكون النتيجة للمثال المذكور أعلاه كالآتي:<br /><br />%2$s
<br /><br />القائمة التالية تحتوي على المواقع المدعومة:<br /><samp>%3$s.</samp>
<br /><br />للمزيد من المعلومات والأمثلة للمواقع المدعومة,
<br><br>ستكون النتيجة للمثال المذكور أعلاه كالآتي:<br><br>%2$s
<br><br>القائمة التالية تحتوي على المواقع المدعومة:<br><samp>%3$s.</samp>
<br><br>للمزيد من المعلومات والأمثلة للمواقع المدعومة,
انقر على هذا الرابط <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
معلومات إدراج مُحتوى الوسائط</a>.',
'HELP_EMBEDDING_MEDIA_DEMO' => 'https://youtu.be/QH2-TGUlwu4',
]);
11 changes: 5 additions & 6 deletions language/cs/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,13 +40,12 @@
$lang = array_merge($lang, [
'HELP_EMBEDDING_MEDIA' => 'Vkládání médií',
'HELP_EMBEDDING_MEDIA_QUESTION' => 'Jak vkládat média z jiných stránek do příspěvků.',
'HELP_EMBEDDING_MEDIA_ANSWER' => 'Uživatelů mohou vkládat obsah jako jsou videa nebo zvukové stopy z povolených stránek používáním <strong>[media][/media]</strong> nebo jednoduše vložením povoleného URL do textu. Například:<br /><br />
'HELP_EMBEDDING_MEDIA_ANSWER' => 'Uživatelů mohou vkládat obsah jako jsou videa nebo zvukové stopy z povolených stránek používáním <strong>[media][/media]</strong> nebo jednoduše vložením povoleného URL do textu. Například:<br><br>
<strong>[media]</strong>%1$s<strong>[/media]</strong>
<br /><br />Jak bylo výše zmíněno, odkaz může být také vložen pomocí
<br><br>Jak bylo výše zmíněno, odkaz může být také vložen pomocí
<strong>[media]</strong> tagů.
<br /><br />Uvedený příklad bude vypadat následovně:<br /><br />%2$s
<br /><br />Tyto stránky jsou podporovány:<br /><samp>%3$s.</samp>
<br /><br />Pro kompletní dokumentaci podporovaných tránek a příklady URL navštivte <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
<br><br>Uvedený příklad bude vypadat následovně:<br><br>%2$s
<br><br>Tyto stránky jsou podporovány:<br><samp>%3$s.</samp>
<br><br>Pro kompletní dokumentaci podporovaných tránek a příklady URL navštivte <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
MediaEmbed Plugin dokumentace</a>.',
'HELP_EMBEDDING_MEDIA_DEMO' => 'https://youtu.be/QH2-TGUlwu4',
]);
11 changes: 5 additions & 6 deletions language/da/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@
'HELP_EMBEDDING_MEDIA_QUESTION' => 'Sådan indlejres medie fra andre steder i indlæg',
'HELP_EMBEDDING_MEDIA_ANSWER' => 'Brugere kan indlejre indhold, såsom videoer og lyd fra tilladte stedet med
<strong>[media][/media]</strong>-tags, eller blot ved at skrive en understøttet
URL i ren tekst. F.eks.:<br /><br />
URL i ren tekst. F.eks.:<br><br>
<strong>[media]</strong>%1$s<strong>[/media]</strong>
<br /><br />Som beskrevet ovenfor, kan linket også bruges uden
<br><br>Som beskrevet ovenfor, kan linket også bruges uden
<strong>[media]</strong>-taggene.
<br /><br />Eksemplet som vises her genererer:<br /><br />%2$s
<br /><br />Følgende steder understøttes:<br /><samp>%3$s.</samp>
<br /><br />Besøg <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
<br><br>Eksemplet som vises her genererer:<br><br>%2$s
<br><br>Følgende steder understøttes:<br><samp>%3$s.</samp>
<br><br>Besøg <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
dokumentationen til MediaEmbed Plugin</a> for fuld dokumentation på understøttede steder og
URL\'er med eksempler.',
'HELP_EMBEDDING_MEDIA_DEMO' => 'https://youtu.be/QH2-TGUlwu4',
]);
11 changes: 5 additions & 6 deletions language/de/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@
'HELP_EMBEDDING_MEDIA_QUESTION' => 'Wie werden Medien von anderen Seiten in Posts eingebunden',
'HELP_EMBEDDING_MEDIA_ANSWER' => 'User können Medien von anderen erlaubten Seiten wie Video und Audio einbinden indem
die <strong>[media][/media]</strong> Tags oder indem einfach die reine URL der erlaubten Seite
in den Text kopiert wird. Als Beispiel:<br /><br />
in den Text kopiert wird. Als Beispiel:<br><br>
<strong>[media]</strong>%1$s<strong>[/media]</strong>
<br /><br />Wie oben beschrieben kann die URL auch ohne die
<br><br>Wie oben beschrieben kann die URL auch ohne die
<strong>[media]</strong> Tags verwendet werden.
<br /><br />Das hier gezeigt Beispiel würde folgendes generieren:<br /><br />%2$s
<br /><br />Die folgenden Seiten sind erlaubt:<br /><samp>%3$s.</samp>
<br /><br />Für eine komplette Dokumentation der unterstützen Seiten und Beispiel URLs,
<br><br>Das hier gezeigt Beispiel würde folgendes generieren:<br><br>%2$s
<br><br>Die folgenden Seiten sind erlaubt:<br><samp>%3$s.</samp>
<br><br>Für eine komplette Dokumentation der unterstützen Seiten und Beispiel URLs,
besuche die <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
MediaEmbed Plugin Documentation</a>.',
'HELP_EMBEDDING_MEDIA_DEMO' => 'https://youtu.be/QH2-TGUlwu4',
]);
11 changes: 5 additions & 6 deletions language/en/help.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,13 @@
'HELP_EMBEDDING_MEDIA_QUESTION' => 'How to embed media from other sites into posts',
'HELP_EMBEDDING_MEDIA_ANSWER' => 'Users can embed content such as videos and audio from allowed sites using
the <strong>[media][/media]</strong> tags, or from simply posting a supported
URL in plain text. For example:<br /><br />
URL in plain text. For example:<br><br>
<strong>[media]</strong>%1$s<strong>[/media]</strong>
<br /><br />As noted above, the link could also be used without the
<br><br>As noted above, the link could also be used without the
<strong>[media]</strong> tags.
<br /><br />The example shown here would generate:<br /><br />%2$s
<br /><br />The following sites are supported:<br /><samp>%3$s.</samp>
<br /><br />For complete documentation on supported sites and example URLs,
<br><br>The example shown here would generate:<br><br>%2$s
<br><br>The following sites are supported:<br><samp>%3$s.</samp>
<br><br>For complete documentation on supported sites and example URLs,
visit the <a href="https://s9etextformatter.readthedocs.io/Plugins/MediaEmbed/Sites/">
MediaEmbed Plugin Documentation</a>.',
'HELP_EMBEDDING_MEDIA_DEMO' => 'https://youtu.be/QH2-TGUlwu4',
]);
Loading