From 20b2e7fecce6dc1125f669d1cd12fea63857923a Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 27 May 2015 17:26:51 +0200 Subject: [PATCH] (proxy) combine validate and save action --- .../OPNsense/Proxy/Api/SettingsController.php | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php index 91febe06a..f86d93c47 100644 --- a/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php +++ b/src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/SettingsController.php @@ -101,23 +101,16 @@ class SettingsController extends ApiControllerBase $result["validations"]["proxy.".$msg->getField()] = $msg->getMessage(); } - // serialize model to config + // serialize model to config and save if ($valMsgs->count() == 0) { $mdlProxy->serializeToConfig(); + $cnf = Config::getInstance(); + $cnf->save(); + $result["result"] = "saved"; } } - - // save config if validated correctly - if (!array_key_exists("validations", $result)) { - $cnf = Config::getInstance(); - $cnf->save(); - $result["result"] = "saved"; - } - - - return $result; }