mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00
Code Issues Releases Wiki Activity

[ticket/13740] Add success message when install finished

Browse Source 
PHPBB3-13740
This commit is contained in:
Mate Bartus 2015-07-23 23:35:20 +02:00
parent 115029b601
commit 3840882b93
3 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
phpBB/assets/javascript/installer.js
View File

@ -52,7 +52,7 @@
if (messages[i].hasOwnProperty('description')) { if (messages[i].hasOwnProperty('description')) {
$description = $(document.createElement('p')); $description = $(document.createElement('p'));
$description.text(messages[i].description); $description.html(messages[i].description);
$msgElement.append($description); $msgElement.append($description);
} }
@ -69,6 +69,10 @@
$msgElement.addClass('log'); $msgElement.addClass('log');
$logContainer.append($msgElement); $logContainer.append($msgElement);
break; break;
case 'success':
$msgElement.addClass('successbox');
$errorContainer.prepend($msgElement);
break;
} }
} }
} }
@ -201,6 +205,10 @@
addMessage('log', responseObject.logs); addMessage('log', responseObject.logs);
} }
if (responseObject.hasOwnProperty('success')) {
addMessage('success', responseObject.success);
}
if (responseObject.hasOwnProperty('form')) { if (responseObject.hasOwnProperty('form')) {
addForm(responseObject.form); addForm(responseObject.form);
} }

2
phpBB/language/en/install_new.php
View File

@ -80,6 +80,8 @@ $lang = array_merge($lang, array(
</ul> </ul>
<p>Only those databases supported on your server will be displayed.', <p>Only those databases supported on your server will be displayed.',
'ACP_LINK' => 'Take me to <a href="%1$s">the ACP</a>',
)); ));
// Requirements translation // Requirements translation

29
phpBB/phpbb/install/installer.php
View File

@ -18,6 +18,7 @@ use phpbb\install\exception\installer_config_not_writable_exception;
use phpbb\install\exception\resource_limit_reached_exception; use phpbb\install\exception\resource_limit_reached_exception;
use phpbb\install\exception\user_interaction_required_exception; use phpbb\install\exception\user_interaction_required_exception;
use phpbb\install\helper\config; use phpbb\install\helper\config;
use phpbb\install\helper\iohandler\cli_iohandler;
use phpbb\install\helper\iohandler\iohandler_interface; use phpbb\install\helper\iohandler\iohandler_interface;
class installer class installer
@ -171,6 +172,34 @@ class installer
// Installation finished // Installation finished
$install_finished = true; $install_finished = true;
if ($this->iohandler instanceof cli_iohandler)
{
$this->iohandler->add_success_message('INSTALLER_FINISHED');
}
else
{
global $SID;
// Construct ACP url
$acp_url = $protocol = $this->install_config->get('server_protocol');
$acp_url .= $this->install_config->get('server_name');
$port = $this->install_config->get('server_port');
if (!((strpos($protocol, 'https:') === 0 && $port === 443)
|| (strpos($protocol, 'http:') === 0 && $port === 80)))
{
$acp_url .= ':' . $port;
}
$acp_url .= $this->install_config->get('script_path');
$acp_url .= '/adm/index.php' . $SID;
$this->iohandler->add_success_message('INSTALLER_FINISHED', array(
'ACP_LINK',
$acp_url,
));
}
} }
catch (user_interaction_required_exception $e) catch (user_interaction_required_exception $e)
{ {