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
3ba3cba1
Commit
3ba3cba1
authored
Mar 04, 2015
by
Franco Fichtner
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
src: s/session_commit/session_write_close/g for consistency
parent
1f8264ac
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
16 additions
and
12 deletions
+16
-12
authgui.inc
src/etc/inc/authgui.inc
+1
-1
config.lib.inc
src/etc/inc/config.lib.inc
+2
-2
firewall_virtual_ip.php
src/www/firewall_virtual_ip.php
+3
-2
headjs.php
src/www/headjs.php
+3
-1
system_firmware_restorefullbackup.php
src/www/system_firmware_restorefullbackup.php
+1
-0
system_usermanager_passwordmg.php
src/www/system_usermanager_passwordmg.php
+6
-6
No files found.
src/etc/inc/authgui.inc
View file @
3ba3cba1
...
@@ -85,7 +85,7 @@ if (!$_SESSION['Post_Login']) {
...
@@ -85,7 +85,7 @@ if (!$_SESSION['Post_Login']) {
* Close session data to allow other scripts from same host to come in.
* Close session data to allow other scripts from same host to come in.
* A session can be reactivated from calling session_start again
* A session can be reactivated from calling session_start again
*/
*/
session_
commit
();
session_
write_close
();
/*
/*
* determine if the user is allowed access to the requested page
* determine if the user is allowed access to the requested page
...
...
src/etc/inc/config.lib.inc
View file @
3ba3cba1
...
@@ -473,14 +473,14 @@ function write_config($desc = 'Unknown', $backup = true)
...
@@ -473,14 +473,14 @@ function write_config($desc = 'Unknown', $backup = true)
if
(
!
empty
(
$_SESSION
[
'Username'
])
&&
(
$_SESSION
[
'Username'
]
!=
'root'
))
{
if
(
!
empty
(
$_SESSION
[
'Username'
])
&&
(
$_SESSION
[
'Username'
]
!=
'root'
))
{
$user
=
getUserEntry
(
$_SESSION
[
'Username'
]);
$user
=
getUserEntry
(
$_SESSION
[
'Username'
]);
if
(
is_array
(
$user
)
&&
userHasPrivilege
(
$user
,
"user-config-readonly"
))
{
if
(
is_array
(
$user
)
&&
userHasPrivilege
(
$user
,
"user-config-readonly"
))
{
session_
commit
();
session_
write_close
();
return
false
;
return
false
;
}
}
}
}
}
}
if
(
!
isset
(
$argc
))
{
if
(
!
isset
(
$argc
))
{
session_
commit
();
session_
write_close
();
}
}
if
(
$backup
)
{
if
(
$backup
)
{
...
...
src/www/firewall_virtual_ip.php
View file @
3ba3cba1
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
Copyright (C) 2005 Bill Marquette <bill.marquette@gmail.com>.
...
@@ -28,7 +29,7 @@
...
@@ -28,7 +29,7 @@
POSSIBILITY OF SUCH DAMAGE.
POSSIBILITY OF SUCH DAMAGE.
*/
*/
require
(
"guiconfig.inc"
);
require
_once
(
"guiconfig.inc"
);
require_once
(
"functions.inc"
);
require_once
(
"functions.inc"
);
require_once
(
"filter.inc"
);
require_once
(
"filter.inc"
);
require_once
(
"shaper.inc"
);
require_once
(
"shaper.inc"
);
...
@@ -152,7 +153,7 @@ if ($_GET['act'] == "del") {
...
@@ -152,7 +153,7 @@ if ($_GET['act'] == "del") {
header
(
"Location: firewall_virtual_ip.php"
);
header
(
"Location: firewall_virtual_ip.php"
);
exit
;
exit
;
}
}
session_
commit
();
session_
write_close
();
// Special case since every proxyarp vip is handled by the same daemon.
// Special case since every proxyarp vip is handled by the same daemon.
if
(
$a_vip
[
$_GET
[
'id'
]][
'mode'
]
==
"proxyarp"
)
{
if
(
$a_vip
[
$_GET
[
'id'
]][
'mode'
]
==
"proxyarp"
)
{
...
...
src/www/headjs.php
View file @
3ba3cba1
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Redistribution and use in source and binary forms, with or without
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
modification, are permitted provided that the following conditions are met:
...
@@ -36,7 +38,7 @@ function getHeadJS() {
...
@@ -36,7 +38,7 @@ function getHeadJS() {
if
(
!
session_id
())
if
(
!
session_id
())
session_start
();
session_start
();
$_SESSION
[
'NO_AJAX'
]
==
"True"
?
$noajax
=
"var noAjaxOnSubmit = true;"
:
$noajax
=
"var noAjaxOnSubmit = false;"
;
$_SESSION
[
'NO_AJAX'
]
==
"True"
?
$noajax
=
"var noAjaxOnSubmit = true;"
:
$noajax
=
"var noAjaxOnSubmit = false;"
;
session_
commit
();
session_
write_close
();
$headjs
.=
"
$headjs
.=
"
{
$noajax
}
{
$noajax
}
...
...
src/www/system_firmware_restorefullbackup.php
View file @
3ba3cba1
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2011 Scott Ullrich
Copyright (C) 2011 Scott Ullrich
...
...
src/www/system_usermanager_passwordmg.php
View file @
3ba3cba1
<?php
<?php
/*
/*
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2014-2015 Deciso B.V.
Copyright (C) 2011 Ermal Luçi
Copyright (C) 2011 Ermal Luçi
...
@@ -26,7 +27,6 @@
...
@@ -26,7 +27,6 @@
POSSIBILITY OF SUCH DAMAGE.
POSSIBILITY OF SUCH DAMAGE.
*/
*/
require_once
(
"certs.inc"
);
require_once
(
"certs.inc"
);
require_once
(
"guiconfig.inc"
);
require_once
(
"guiconfig.inc"
);
...
@@ -49,7 +49,7 @@ if (isset($_POST['save'])) {
...
@@ -49,7 +49,7 @@ if (isset($_POST['save'])) {
// all values are okay --> saving changes
// all values are okay --> saving changes
$config
[
'system'
][
'user'
][
$userindex
[
$_SESSION
[
'Username'
]]][
'password'
]
=
crypt
(
$_POST
[
'passwordfld1'
],
'$6$'
);
$config
[
'system'
][
'user'
][
$userindex
[
$_SESSION
[
'Username'
]]][
'password'
]
=
crypt
(
$_POST
[
'passwordfld1'
],
'$6$'
);
local_user_set
(
$config
[
'system'
][
'user'
][
$userindex
[
$_SESSION
[
'Username'
]]]);
local_user_set
(
$config
[
'system'
][
'user'
][
$userindex
[
$_SESSION
[
'Username'
]]]);
session_
commit
();
session_
write_close
();
write_config
();
write_config
();
...
@@ -66,7 +66,7 @@ foreach($config['system']['user'] as $user)
...
@@ -66,7 +66,7 @@ foreach($config['system']['user'] as $user)
if
(
$user
[
'name'
]
==
$_SESSION
[
'Username'
])
if
(
$user
[
'name'
]
==
$_SESSION
[
'Username'
])
$islocal
=
true
;
$islocal
=
true
;
session_
commit
();
session_
write_close
();
include
(
"head.inc"
);
include
(
"head.inc"
);
...
@@ -107,7 +107,7 @@ include("head.inc");
...
@@ -107,7 +107,7 @@ include("head.inc");
session_start
();
session_start
();
?>
?>
<td
colspan=
"2"
valign=
"top"
class=
"listtopic"
>
<?=
$_SESSION
[
'Username'
]
?>
's
<?=
gettext
(
"Password"
);
?>
</td>
<td
colspan=
"2"
valign=
"top"
class=
"listtopic"
>
<?=
$_SESSION
[
'Username'
]
?>
's
<?=
gettext
(
"Password"
);
?>
</td>
<?php
session_
commit
();
?>
<?php
session_
write_close
();
?>
</tr>
</tr>
<tr>
<tr>
<td
width=
"22%"
valign=
"top"
class=
"vncell"
>
<?=
gettext
(
"Password"
);
?>
</td>
<td
width=
"22%"
valign=
"top"
class=
"vncell"
>
<?=
gettext
(
"Password"
);
?>
</td>
...
...
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