makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-24 02:48:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12685] Add --safe-mode

Browse source 
PHPBB3-12685
This commit is contained in:
Carlo 2014-07-15 00:38:07 +02:00
parent 6082b5e3d3
commit 2ec50c0ff1
3 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
phpBB/bin/phpbbcli.php
View file

@ -12,6 +12,8 @@
*
*/
use Symfony\Component\Console\Input\ArgvInput;
if (php_sapi_name() != 'cli')
{
echo 'This program must be run from the command line.' . PHP_EOL;
@ -39,7 +41,15 @@ $phpbb_class_loader_ext = new \phpbb\class_loader('\\', "{$phpbb_root_path}ext/"
$phpbb_class_loader_ext->register();
$phpbb_container_builder = new \phpbb\di\container_builder($phpbb_config_php_file, $phpbb_root_path, $phpEx);
$phpbb_container_builder->set_dump_container(false);
$phpbb_container_builder->set_dump_container(true);
$input = new ArgvInput();
if ($input->hasParameterOption(array('--safe-mode')))
{
$phpbb_container_builder->set_use_extensions(false);
$phpbb_container_builder->set_dump_container(false);
}
$phpbb_container = $phpbb_container_builder->get_container();
$phpbb_container->get('request')->enable_super_globals();
@ -50,4 +60,4 @@ $user->add_lang('acp/common');
$application = new \phpbb\console\application('phpBB Console', PHPBB_VERSION, $user);
$application->register_container_commands($phpbb_container);
$application->run();
$application->run($input);

1
phpBB/language/en/acp/common.php
View file

@ -230,6 +230,7 @@ $lang = array_merge($lang, array(
'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run',
'CLI_DESCRIPTION_OPTION_SHELL' => 'Launch the shell.',
'CLI_DESCRIPTION_OPTION_SAFE_MODE' => 'Run in Safe Mode (without extensions).',
'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.',

7
phpBB/phpbb/console/application.php
View file

@ -67,6 +67,13 @@ class application extends \Symfony\Component\Console\Application
$this->user->lang('CLI_DESCRIPTION_OPTION_SHELL')
));
$this->getDefinition()->addOption(new InputOption(
'--safe-mode',
null,
InputOption::VALUE_NONE,
$this->user->lang('CLI_DESCRIPTION_OPTION_SAFE_MODE')
));
return parent::getHelp();
}