Commit deb6f79d authored by Franco Fichtner's avatar Franco Fichtner

src: wrong project, gettext() mishap and general style

Spotted by: @fabianfrz
parent c1165499
...@@ -2295,27 +2295,30 @@ EOD; ...@@ -2295,27 +2295,30 @@ EOD;
return 0; return 0;
} }
/* configure cron service */ function configure_cron()
function configure_cron() { {
global $g, $config; global $config;
$anchor = '# custom crontab entries';
/* preserve existing crontab entries */ /* preserve existing crontab entries */
$crontab_contents = file("/etc/crontab", FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES); $crontab_contents = file('/etc/crontab', FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES);
for ($i = 0; $i < count($crontab_contents); $i++) { for ($i = 0; $i < count($crontab_contents); $i++) {
$cron_item =& $crontab_contents[$i]; $cron_item = &$crontab_contents[$i];
if (strpos($cron_item, "# pfSense specific crontab entries") !== false) { if (strpos($cron_item, $anchor) !== false) {
array_splice($crontab_contents, $i - 1); array_splice($crontab_contents, $i - 1);
break; break;
} }
} }
$crontab_contents = implode("\n", $crontab_contents) . "\n";
/* please maintain the newline at the end of file */
$crontab_contents = implode("\n", $crontab_contents) . "\n";
if (is_array($config['cron']['item'])) { if (isset($config['cron']['item'])) {
$crontab_contents .= "#\n"; $crontab_contents .= "#\n";
$crontab_contents .= "# " . gettext("pfSense specific crontab entries") . "\n"; $crontab_contents .= $anchor . "\n";
$crontab_contents .= "# " .gettext( "Created:") . " " . date("F j, Y, g:i a") . "\n"; $crontab_contents .= '# auto-generated at ' . date('F j, Y, g:i a') . "\n";
$crontab_contents .= "#\n"; $crontab_contents .= "#\n";
foreach ($config['cron']['item'] as $item) { foreach ($config['cron']['item'] as $item) {
...@@ -2329,18 +2332,15 @@ function configure_cron() { ...@@ -2329,18 +2332,15 @@ function configure_cron() {
} }
$crontab_contents .= "\n#\n"; $crontab_contents .= "\n#\n";
$crontab_contents .= "# " . gettext("If possible do not add items to this file manually.") . "\n"; $crontab_contents .= "# If possible do not add items to this file manually.\n";
$crontab_contents .= "# " . gettext("If you do so, this file must be terminated with a blank line (e.g. new line)") . "\n"; $crontab_contents .= "# If you do so, this file must be terminated with a blank line (e.g. new line)\n";
$crontab_contents .= "#\n\n"; $crontab_contents .= "#\n\n";
} }
/* please maintain the newline at the end of file */
file_put_contents('/etc/crontab', $crontab_contents); file_put_contents('/etc/crontab', $crontab_contents);
unset($crontab_contents); unset($crontab_contents);
/* do a HUP kill to force sync changes */
killbypid('/var/run/cron.pid', 'HUP'); killbypid('/var/run/cron.pid', 'HUP');
} }
function upnp_action ($action) { function upnp_action ($action) {
......
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
}, },
"page-diagnostics-crash-reporter": { "page-diagnostics-crash-reporter": {
"name": "WebCfg - Crash reporter", "name": "WebCfg - Crash reporter",
"descr": "Uploads crash reports to pfSense and or deletes crash reports.", "descr": "Uploads crash reports to the developers.",
"match": [ "match": [
"crash_reporter.php*" "crash_reporter.php*"
] ]
...@@ -641,8 +641,8 @@ ...@@ -641,8 +641,8 @@
] ]
}, },
"page-pfsensewizardsubsystem": { "page-pfsensewizardsubsystem": {
"name": "WebCfg - pfSense wizard subsystem page", "name": "WebCfg - Wizard subsystem page",
"descr": "Allow access to the 'pfSense wizard subsystem' page.", "descr": "Allow access to the 'Wizard subsystem' page.",
"match": [ "match": [
"wizard.php*" "wizard.php*"
] ]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment