makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-18 09:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12597] Update USE_SYSTEM_CRON_EXPLAIN to be a bit more verbose.
  [ticket/12597] Improve language for cron:run command.
  [ticket/12597] Do not output anything besides the gif image.
This commit is contained in:
Joas Schilling 2014-05-30 22:52:14 +02:00
commit ee8e5bcf37
4 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
phpBB/cron.php
View file

@ -41,8 +41,6 @@ function output_image()
// the cron lock locked, especially when working on cron-related code. // the cron lock locked, especially when working on cron-related code.
// //
// Attempt to alleviate the problem by doing setup outside of the lock as much as possible. // Attempt to alleviate the problem by doing setup outside of the lock as much as possible.
//
// If DEBUG is defined and cron lock cannot be obtained, a message will be printed.
$cron_type = request_var('cron_type', ''); $cron_type = request_var('cron_type', '');
@ -68,12 +66,4 @@ if ($cron_lock->acquire())
} }
} }
$cron_lock->release(); $cron_lock->release();
}
else
{
if (defined('DEBUG'))
{
echo $user->lang('CRON_LOCK_ERROR') . "\n";
}
} }

2
phpBB/language/en/acp/board.php
View file

@ -461,7 +461,7 @@ $lang = array_merge($lang, array(
'UPLOAD_ICONS_PATH' => 'Extension group icons storage path', 'UPLOAD_ICONS_PATH' => 'Extension group icons storage path',
'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.', 'UPLOAD_ICONS_PATH_EXPLAIN' => 'Path under your phpBB root directory, e.g. <samp>images/upload_icons</samp>.',
'USE_SYSTEM_CRON' => 'Run periodic tasks from system cron', 'USE_SYSTEM_CRON' => 'Run periodic tasks from system cron',
'USE_SYSTEM_CRON_EXPLAIN' => 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>cron:run</code> command to be run by the system cron facility at regular intervals (e.g. every 5 minutes).', 'USE_SYSTEM_CRON_EXPLAIN' => 'When off, phpBB will arrange for periodic tasks to be run automatically. When on, phpBB will not schedule any periodic tasks by itself; a system administrator must arrange for <code>bin/phpbbcli.php cron:run</code> to be run by the system cron facility at regular intervals (e.g. every 5 minutes).',
)); ));
// Security Settings // Security Settings

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

@ -223,14 +223,14 @@ $lang = array_merge($lang, array(
'BACK' => 'Back', 'BACK' => 'Back',
'CLI_DESCRIPTION_CRON_RUN' => 'Runs all available cron tasks.', 'CLI_DESCRIPTION_CRON_RUN' => 'Runs all ready cron tasks.',
'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run', 'CLI_DESCRIPTION_CRON_RUN_ARGUMENT_1' => 'Name of the task to be run',
'COLOUR_SWATCH' => 'Web-safe colour swatch', 'COLOUR_SWATCH' => 'Web-safe colour swatch',
'CONFIG_UPDATED' => 'Configuration updated successfully.', 'CONFIG_UPDATED' => 'Configuration updated successfully.',
'CRON_LOCK_ERROR' => 'Could not obtain cron lock.', 'CRON_LOCK_ERROR' => 'Could not obtain cron lock.',
'CRON_NO_SUCH_TASK' => 'No such cron task', 'CRON_NO_SUCH_TASK' => 'Could not find cron task “%s”.',
'CRON_NO_TASK' => 'No task to be run', 'CRON_NO_TASK' => 'No cron tasks need to be run right now.',
'DEACTIVATE' => 'Deactivate', 'DEACTIVATE' => 'Deactivate',
'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.', 'DIRECTORY_DOES_NOT_EXIST' => 'The entered path “%s” does not exist.',

6
phpBB/phpbb/console/command/cron/run.php
View file

@ -3,7 +3,7 @@
* *
* This file is part of the phpBB Forum Software package. * This file is part of the phpBB Forum Software package.
* *
* @copyright (c) phpBB Limited * @copyright (c) phpBB Limited
* @license GNU General Public License, version 2 (GPL-2.0) * @license GNU General Public License, version 2 (GPL-2.0)
* *
* For full copyright and license information, please see * For full copyright and license information, please see
@ -67,7 +67,7 @@ class run extends \phpbb\console\command\command
* and the exit status is set to 1. * and the exit status is set to 1.
* If the verbose option is specified, each start of a task is printed. * If the verbose option is specified, each start of a task is printed.
* Otherwise there is no output. * Otherwise there is no output.
* If an argument is given to the command, only the task whose name matches the * If an argument is given to the command, only the task whose name matches the
* argument will be started. If verbose option is specified, * argument will be started. If verbose option is specified,
* an info message containing the name of the task is printed. * an info message containing the name of the task is printed.
* If no task matches the argument given, an error message is printed * If no task matches the argument given, an error message is printed
@ -169,7 +169,7 @@ class run extends \phpbb\console\command\command
} }
else else
{ {
$output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK') . '</error>'); $output->writeln('<error>' . $this->user->lang('CRON_NO_SUCH_TASK', $task_name) . '</error>');
return 2; return 2;
} }
} }