Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
2a693fc4
Commit
2a693fc4
authored
Mar 13, 2015
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove unused parameter from parse_config
parent
74059733
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
8 additions
and
10 deletions
+8
-10
config.lib.inc
src/etc/inc/config.lib.inc
+3
-5
pfsense-utils.inc
src/etc/inc/pfsense-utils.inc
+2
-2
rc.php_test_run
src/etc/rc.php_test_run
+1
-1
diag_backup.php
src/www/diag_backup.php
+2
-2
No files found.
src/etc/inc/config.lib.inc
View file @
2a693fc4
...
@@ -34,12 +34,10 @@ require_once("script/load_phalcon.php");
...
@@ -34,12 +34,10 @@ require_once("script/load_phalcon.php");
/****f* config/parse_config
/****f* config/parse_config
* NAME
* NAME
* parse_config - Read in config.cache or config.xml if needed and return $config array
* parse_config - Read in config.cache or config.xml if needed and return $config array
* INPUTS
* $parse - boolean to force parse_config() to read config.xml and generate config.cache
* RESULT
* RESULT
* $config - array containing all configuration variables
* $config - array containing all configuration variables
******/
******/
function
parse_config
(
$parse
=
false
)
function
parse_config
()
{
{
$cnf
=
OPNsense\Core\Config
::
getInstance
();
$cnf
=
OPNsense\Core\Config
::
getInstance
();
if
(
!
$cnf
->
isValid
())
{
if
(
!
$cnf
->
isValid
())
{
...
@@ -107,7 +105,7 @@ function parse_config_bootup()
...
@@ -107,7 +105,7 @@ function parse_config_bootup()
}
}
$config
=
parse_config
(
true
);
$config
=
parse_config
();
if
((
float
)
$config
[
'version'
]
>
(
float
)
$g
[
'latest_config'
])
{
if
((
float
)
$config
[
'version'
]
>
(
float
)
$g
[
'latest_config'
])
{
echo
<<<EOD
echo
<<<EOD
...
@@ -301,7 +299,7 @@ function config_restore($conffile) {
...
@@ -301,7 +299,7 @@ function config_restore($conffile) {
unlock
(
$lockkey
);
unlock
(
$lockkey
);
$config
=
parse_config
(
true
);
$config
=
parse_config
();
write_config
(
gettext
(
"Reverted to"
)
.
" "
.
array_pop
(
explode
(
"/"
,
$conffile
))
.
"."
,
false
);
write_config
(
gettext
(
"Reverted to"
)
.
" "
.
array_pop
(
explode
(
"/"
,
$conffile
))
.
"."
,
false
);
...
...
src/etc/inc/pfsense-utils.inc
View file @
2a693fc4
...
@@ -737,7 +737,7 @@ function reload_interfaces_sync() {
...
@@ -737,7 +737,7 @@ function reload_interfaces_sync() {
log_error
(
gettext
(
"reload_interfaces_sync() is starting."
));
log_error
(
gettext
(
"reload_interfaces_sync() is starting."
));
/* parse config.xml again */
/* parse config.xml again */
$config
=
parse_config
(
true
);
$config
=
parse_config
();
/* enable routing */
/* enable routing */
system_routing_enable
();
system_routing_enable
();
...
@@ -787,7 +787,7 @@ function reload_all_sync() {
...
@@ -787,7 +787,7 @@ function reload_all_sync() {
global
$config
,
$g
;
global
$config
,
$g
;
/* parse config.xml again */
/* parse config.xml again */
$config
=
parse_config
(
true
);
$config
=
parse_config
();
/* set up our timezone */
/* set up our timezone */
system_timezone_configure
();
system_timezone_configure
();
...
...
src/etc/rc.php_test_run
View file @
2a693fc4
...
@@ -13,7 +13,7 @@ require_once('xmlparse.inc');
...
@@ -13,7 +13,7 @@ require_once('xmlparse.inc');
require_once
(
'config.lib.inc'
);
require_once
(
'config.lib.inc'
);
require_once
(
'functions.inc'
);
require_once
(
'functions.inc'
);
$config
=
parse_config
(
true
);
$config
=
parse_config
();
$passed_tests
=
true
;
$passed_tests
=
true
;
...
...
src/www/diag_backup.php
View file @
2a693fc4
...
@@ -145,7 +145,7 @@ function add_base_packages_menu_items() {
...
@@ -145,7 +145,7 @@ function add_base_packages_menu_items() {
}
}
if
(
$modified_config
)
{
if
(
$modified_config
)
{
write_config
(
gettext
(
"Restored base_package menus after configuration restore."
));
write_config
(
gettext
(
"Restored base_package menus after configuration restore."
));
$config
=
parse_config
(
true
);
$config
=
parse_config
();
}
}
}
}
...
@@ -390,7 +390,7 @@ if ($_POST) {
...
@@ -390,7 +390,7 @@ if ($_POST) {
touch
(
"/conf/needs_package_sync"
);
touch
(
"/conf/needs_package_sync"
);
/* remove cache, we will force a config reboot */
/* remove cache, we will force a config reboot */
@
unlink
(
'/tmp/config.cache'
);
@
unlink
(
'/tmp/config.cache'
);
$config
=
parse_config
(
true
);
$config
=
parse_config
();
/* extract out rrd items, unset from $config when done */
/* extract out rrd items, unset from $config when done */
if
(
$config
[
'rrddata'
])
{
if
(
$config
[
'rrddata'
])
{
restore_rrddata
();
restore_rrddata
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment