makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11150] Display extension status in "gallery"

Browse source 
PHPBB3-11150
This commit is contained in:
Tristan Darricau 2015-09-14 13:55:21 +02:00 • committed by Tristan Darricau
parent a32d429f1e
commit 51916def9c
No known key found for this signature in database
GPG key ID: 817043C2E29DB881
4 changed files with 32 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/adm/style/acp_ext_gallery.html
View file

@ -45,7 +45,16 @@
<tr> <tr>
<td> <td>
<strong>{{ extension.name }}</strong><br /> <strong>{{ extension.name }}</strong><br />
<span><a href="{{ extension.url }}">{{ lang('DETAILS') }}</a> &bull; <a href="{{ U_ACTION }}&amp;action=install&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('INSTALL') }}</a></span> <span>
<a href="{{ extension.url }}">{{ lang('DETAILS') }}</a> &bull;
{% if extension.name in managed_extensions %}
<span style="color: #228822;">{{ lang('INSTALLED') }}</span>
{% elseif extension.name in installed_extensions -%}
<span style="color: #BC2A4D;">{{ lang('INSTALLED_MANUALLY') }}</span> (<a href="{{ U_ACTION }}&amp;action=manage&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('MANAGE') }}</a>)
{% else -%}
<a href="{{ U_ACTION }}&amp;action=install&amp;extension={{ extension.composer_name|url_encode }}">{{ lang('INSTALL') }}</a>
{%- endif -%}
</span>
</td> </td>
<td>{{ extension.version }}</td> <td>{{ extension.version }}</td>
<td>{{ extension.description }}</td> <td>{{ extension.description }}</td>

7
phpBB/includes/acp/acp_extensions.php
View file

@ -413,6 +413,9 @@ class acp_extensions
/** @var \phpbb\composer\manager $composer_manager */ /** @var \phpbb\composer\manager $composer_manager */
$composer_manager = $phpbb_container->get('ext.composer.manager'); $composer_manager = $phpbb_container->get('ext.composer.manager');
/** @var \phpbb\extension\manager $extensions_manager */
$extensions_manager = $phpbb_container->get('ext.manager');
switch ($action) switch ($action)
{ {
case 'install': case 'install':
@ -451,7 +454,7 @@ class acp_extensions
{ {
$message_text = $e->getPrevious()->getMessage(); $message_text = $e->getPrevious()->getMessage();
if (strpos($message_text, 'ext/') === 0 && strpos($message_text, 'does not exist and could not be created.') !== false) if (strpos($message_text, 'ext/') === 0 && strpos($message_text, 'does not exist and could not be created.') !== false)
{dump($e->getPrevious()->getTraceAsString()); {
$message_text = $language->lang('EXTENSIONS_DIR_NOT_WRITABLE'); $message_text = $language->lang('EXTENSIONS_DIR_NOT_WRITABLE');
} }
$message_text .= adm_back_link($this->u_action); $message_text .= adm_back_link($this->u_action);
@ -499,6 +502,8 @@ class acp_extensions
$this->request->enable_super_globals(); $this->request->enable_super_globals();
$this->template->assign_var('extensions', $manager->get_available_packages()); $this->template->assign_var('extensions', $manager->get_available_packages());
$this->template->assign_var('managed_extensions', array_keys($manager->get_managed_packages()));
$this->template->assign_var('installed_extensions', array_keys($extensions_manager->all_available()));
$this->template->assign_var('U_ACTION', $this->u_action); $this->template->assign_var('U_ACTION', $this->u_action);
$this->request->disable_super_globals(); $this->request->disable_super_globals();
break; break;

3
phpBB/language/en/acp/extensions.php
View file

@ -104,6 +104,9 @@ $lang = array_merge($lang, array(
'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?', 'EXTENSION_ENABLE_CONFIRM' => 'Are you sure that you wish to enable the “%s” extension?',
'EXTENSION_FORCE_UNSTABLE_CONFIRM' => 'Are you sure that you wish to force the use of unstable version?', 'EXTENSION_FORCE_UNSTABLE_CONFIRM' => 'Are you sure that you wish to force the use of unstable version?',
'INSTALLED' => 'Installed',
'INSTALLED_MANUALLY' => 'Installed manually',
'RETURN_TO_EXTENSION_LIST' => 'Return to the extension list', 'RETURN_TO_EXTENSION_LIST' => 'Return to the extension list',
'EXT_DETAILS' => 'Extension Details', 'EXT_DETAILS' => 'Extension Details',

16
phpBB/phpbb/composer/io/translate_composer_trait.php
View file

@ -42,7 +42,7 @@ trait translate_composer_trait
$parameters = []; $parameters = [];
$level = 0; $level = 0;
$message = trim(strip_tags($message), "\n\r"); $message = trim($this->strip_format($message), "\n\r");
if (strpos($message, 'Deleting ') === 0) if (strpos($message, 'Deleting ') === 0)
{ {
@ -94,7 +94,7 @@ trait translate_composer_trait
$parameters = []; $parameters = [];
$level = 0; $level = 0;
$message = trim(strip_tags($message), "\n\r"); $message = trim($this->strip_format($message), "\n\r");
if (strpos($message, ' Problem ') === 0) if (strpos($message, ' Problem ') === 0)
{ {
@ -103,7 +103,7 @@ trait translate_composer_trait
continue; continue;
} }
$lang_key = "\n" . $message . "\n"; $lang_key = "\n" . htmlentities($message) . "\n";
$level = 4; $level = 4;
} }
else if ($message === 'Updating dependencies') else if ($message === 'Updating dependencies')
@ -209,4 +209,14 @@ trait translate_composer_trait
return $error; return $error;
} }
protected function strip_format($message)
{
return str_replace([
'<info>', '</info>',
'<warning>', '</warning>',
'<comment>', '</comment>',
'<error>', '</error>',
], '', $message);
}
} }