From dff1a09d6037799a0a71c3b628bc83fddbab89dd Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Thu, 20 Nov 2008 22:11:06 +0000
Subject: Mount image rw during changes

---
 usr/local/www/system_usermanager.php          |  3 +++
 usr/local/www/system_usermanager_addcert.php  |  6 +++++-
 usr/local/www/system_usermanager_addprivs.php |  6 +++++-
 usr/local/www/system_usermanager_settings.php | 11 +++++++----
 4 files changed, 20 insertions(+), 6 deletions(-)

(limited to 'usr')

diff --git a/usr/local/www/system_usermanager.php b/usr/local/www/system_usermanager.php
index 2670a63..b82484a 100644
--- a/usr/local/www/system_usermanager.php
+++ b/usr/local/www/system_usermanager.php
@@ -167,6 +167,7 @@ if (isAllowedPage("system_usermanager")) {
 	}
 
 	if ($_POST) {
+		conf_mount_rw();
 		unset($input_errors);
 		$pconfig = $_POST;
 
@@ -236,6 +237,8 @@ if (isAllowedPage("system_usermanager")) {
 			local_user_set_groups($userent,$_POST['groups']);
 			write_config();
 
+			conf_mount_ro();
+			
 			pfSenseHeader("system_usermanager.php");
 		}
 	}
diff --git a/usr/local/www/system_usermanager_addcert.php b/usr/local/www/system_usermanager_addcert.php
index d975c19..9af9a9c 100644
--- a/usr/local/www/system_usermanager_addcert.php
+++ b/usr/local/www/system_usermanager_addcert.php
@@ -65,7 +65,8 @@ if ($_GET) {
 }
 
 if ($_POST) {
-
+	conf_mount_rw();
+	
 	unset($input_errors);
 	$pconfig = $_POST;
 
@@ -93,6 +94,7 @@ if ($_POST) {
 	/* if this is an AJAX caller then handle via JSON */
 	if (isAjax() && is_array($input_errors)) {
 		input_errors2Ajax($input_errors);
+		conf_mount_ro();
 		exit;
 	}
 
@@ -122,6 +124,8 @@ if ($_POST) {
 
 		write_config();
 
+		conf_mount_ro();
+		
 		pfSenseHeader("system_usermanager.php?act=edit&id={$userid}");
 	}
 }
diff --git a/usr/local/www/system_usermanager_addprivs.php b/usr/local/www/system_usermanager_addprivs.php
index 8a7da15..85238c3 100644
--- a/usr/local/www/system_usermanager_addprivs.php
+++ b/usr/local/www/system_usermanager_addprivs.php
@@ -60,6 +60,7 @@ if (!is_array($a_user['priv']))
 	$a_user['priv'] = array();
 
 if ($_POST) {
+	conf_mount_rw();
 
 	unset($input_errors);
 	$pconfig = $_POST;
@@ -89,10 +90,13 @@ if ($_POST) {
 		local_user_set($a_user);
 		$retval = write_config();
 		$savemsg = get_std_save_message($retval);
-
+		conf_mount_ro();
+		
 		pfSenseHeader("system_usermanager.php?act=edit&id={$userid}");
+		
 		exit;
 	}
+	conf_mount_ro();
 }
 
 /* if ajax is calling, give them an update message */
diff --git a/usr/local/www/system_usermanager_settings.php b/usr/local/www/system_usermanager_settings.php
index 8f82622..e996abc 100755
--- a/usr/local/www/system_usermanager_settings.php
+++ b/usr/local/www/system_usermanager_settings.php
@@ -30,6 +30,7 @@
     ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
     POSSIBILITY OF SUCH DAMAGE.
 */
+
 ##|+PRIV
 ##|*IDENT=page-system-usermanager-settings
 ##|*NAME=System: User manager: settings page
@@ -37,8 +38,6 @@
 ##|*MATCH=system_usermanager_settings.php*
 ##|-PRIV
 
-
-
 if($_POST['savetest'])
 	$save_and_test = true;
 
@@ -61,6 +60,8 @@ $pgtitle = array("System","User manager settings");
 if ($_POST) {
 	unset($input_errors);
 
+	conf_mount_rw();
+
 	do_input_validation($_POST, $reqdfields, $reqdfieldsn, &$input_errors);
 
 	if($_POST['session_timeout']) {
@@ -129,6 +130,9 @@ if ($_POST) {
 		write_config();
 
 	}
+
+	conf_mount_ro();
+
 }
 
 include("head.inc");
@@ -357,5 +361,4 @@ if(!$pconfig['backend'])
 	                return true;
 	        }
 	}
-</script>
-
+</script>
\ No newline at end of file
-- 
cgit v1.1