lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 00:24:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Spotted by: @fabianfrz
This commit is contained in:
Franco Fichtner 2015-08-21 18:17:07 +02:00
parent c1165499ac
commit deb6f79d6c
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/etc/inc/services.inc
View File

@ -2295,27 +2295,30 @@ EOD;
return 0;
}
/* configure cron service */
function configure_cron() {
global $g, $config;
function configure_cron()
{
global $config;
$anchor = '# custom 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++) {
$cron_item =& $crontab_contents[$i];
if (strpos($cron_item, "# pfSense specific crontab entries") !== false) {
$cron_item = &$crontab_contents[$i];
if (strpos($cron_item, $anchor) !== false) {
array_splice($crontab_contents, $i - 1);
break;
}
}
/* 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 .= "# " . gettext("pfSense specific crontab entries") . "\n";
$crontab_contents .= "# " .gettext( "Created:") . " " . date("F j, Y, g:i a") . "\n";
$crontab_contents .= $anchor . "\n";
$crontab_contents .= '# auto-generated at ' . date('F j, Y, g:i a') . "\n";
$crontab_contents .= "#\n";
foreach ($config['cron']['item'] as $item) {
@ -2329,18 +2332,15 @@ function configure_cron() {
}
$crontab_contents .= "\n#\n";
$crontab_contents .= "# " . gettext("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 possible do not add items to this file manually.\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";
}
/* please maintain the newline at the end of file */
file_put_contents('/etc/crontab', $crontab_contents);
unset($crontab_contents);
/* do a HUP kill to force sync changes */
killbypid('/var/run/cron.pid', 'HUP');
}
function upnp_action ($action) {

6
src/opnsense/mvc/app/models/OPNsense/Core/ACL_Legacy_Page_Map.json
View File

@ -54,7 +54,7 @@
},
"page-diagnostics-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": [
"crash_reporter.php*"
]
@ -641,8 +641,8 @@
]
},
"page-pfsensewizardsubsystem": {
"name": "WebCfg - pfSense wizard subsystem page",
"descr": "Allow access to the 'pfSense wizard subsystem' page.",
"name": "WebCfg - Wizard subsystem page",
"descr": "Allow access to the 'Wizard subsystem' page.",
"match": [
"wizard.php*"
]