[internetaccess] reworked permission system from "click and you get error" to "button is disabled due to lack of permission"

1 files changed, 20 insertions, 22 deletions

diff --git a/modules-available/internetaccess/page.inc.php b/modules-available/internetaccess/page.inc.php
index b1dff722..89897fa4 100644
--- a/modules-available/internetaccess/page.inc.php
+++ b/modules-available/internetaccess/page.inc.php
@@ -15,29 +15,24 @@ class Page_InternetAccess extends Page
 		$action = Request::any('action', 'show');
 
 		if ($action == 'save') {
-			if (User::hasPermission("configuration.save")) {
-				if (isset($_POST['PROXY_CONF'])) {
-					$data = array();
-					foreach (array('PROXY_CONF', 'PROXY_ADDR', 'PROXY_PORT', 'PROXY_USERNAME', 'PROXY_PASSWORD') as $key) {
-						$data[$key] = Request::post($key, '');
-					}
-					if (!FileUtil::arrayToFile(CONFIG_PROXY_CONF, $data)) {
-						Message::addError('main.error-write', CONFIG_PROXY_CONF);
-						Util::redirect();
-					} else {
-						Message::addSuccess('settings-updated');
-						Taskmanager::release(Taskmanager::submit('ReloadProxy'));
-						$taskids = array();
-						Trigger::stopDaemons(NULL, $taskids);
-						$taskids = array();
-						Trigger::startDaemons(NULL, $taskids);
-						Session::set('ia-restart', $taskids);
-						Util::redirect('?do=InternetAccess&show=update');
-					}
+			if (isset($_POST['PROXY_CONF'])) {
+				$data = array();
+				foreach (array('PROXY_CONF', 'PROXY_ADDR', 'PROXY_PORT', 'PROXY_USERNAME', 'PROXY_PASSWORD') as $key) {
+					$data[$key] = Request::post($key, '');
+				}
+				if (!FileUtil::arrayToFile(CONFIG_PROXY_CONF, $data)) {
+					Message::addError('main.error-write', CONFIG_PROXY_CONF);
+					Util::redirect();
+				} else {
+					Message::addSuccess('settings-updated');
+					Taskmanager::release(Taskmanager::submit('ReloadProxy'));
+					$taskids = array();
+					Trigger::stopDaemons(NULL, $taskids);
+					$taskids = array();
+					Trigger::startDaemons(NULL, $taskids);
+					Session::set('ia-restart', $taskids);
+					Util::redirect('?do=InternetAccess&show=update');
 				}
-			} else {
-				Message::addError('main.no-permission');
-				Util::redirect('?do=internetaccess');
 			}
 		}
 	}
@@ -56,6 +51,9 @@ class Page_InternetAccess extends Page
 		if (!isset($data['PROXY_CONF']))
 			$data['PROXY_CONF'] = 'AUTO';
 		$data['selected_' . $data['PROXY_CONF']] = 'selected';
+
+		$data['allowedSave'] = User::hasPermission("configuration.safe");
+
 		Render::addTemplate('_page', $data);
 	}