diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php b/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php
index 714dc75e3..2187de4f7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Monit/Api/SettingsController.php
@@ -261,53 +261,4 @@ class SettingsController extends ApiMutableModelControllerBase
{
return ['monit' => $this->getModel()->general->getNodes(), 'result' => 'ok'];
}
-
- /**
- * import system notification settings
- * @return array result
- */
- public function notificationAction()
- {
- $result = array("result" => "failed");
- if ($this->request->isPost()) {
- $this->sessionClose();
-
- $cfg = Config::getInstance();
- $cfgObj = $cfg->object();
- $node = $this->getModel()->getNodeByReference('general');
- $generalSettings = array();
-
- // inherit SMTP settings from System->Settings->Notifications
- if (!empty($cfgObj->notifications->smtp->ipaddress)) {
- $generalSettings['mailserver'] = $cfgObj->notifications->smtp->ipaddress;
- }
- if (!empty($cfgObj->notifications->smtp->port)) {
- $generalSettings['port'] = $cfgObj->notifications->smtp->port;
- }
- $generalSettings['username'] = $cfgObj->notifications->smtp->username;
- $generalSettings['password'] = $cfgObj->notifications->smtp->password;
- if ((!empty($cfgObj->notifications->smtp->tls) && $cfgObj->notifications->smtp->tls == 1) ||
- (!empty($cfgObj->notifications->smtp->ssl) && $cfgObj->notifications->smtp->ssl == 1)) {
- $generalSettings['ssl'] = 1;
- } else {
- $generalSettings['ssl'] = 0;
- }
-
- // apply them
- $node->setNodes($generalSettings);
- $valMsgs = $this->getModel()->performValidation();
- foreach ($valMsgs as $field => $msg) {
- $fieldnm = str_replace($node->__reference, "monit.general.", $msg->getField());
- $result["validations"][$fieldnm] = $msg->getMessage();
- }
- if (empty($result["validations"])) {
- unset($result["validations"]);
- $this->getModel()->serializeToConfig();
- Config::getInstance()->save();
- $result['status'] = 'ok';
- $result['result'] = 'OK';
- }
- }
- return $result;
- }
}
diff --git a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
index 8c9e12131..6501c0c0c 100644
--- a/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
+++ b/src/opnsense/mvc/app/views/OPNsense/Monit/index.volt
@@ -72,37 +72,6 @@ POSSIBILITY OF SUCH DAMAGE.
});
});
- /**
- * add button 'Import System Notification'
- * can't do it via base_dialog
- */
- $('').insertAfter('#btn_ApplyGeneralSettings');
-
- $('#btnImportSystemNotification').unbind('click').click(function(){
- $('#btnImportSystemNotificationProgress').addClass("fa fa-spinner fa-pulse");
- ajaxCall("/api/monit/settings/notification", {}, function(data,status) {
- $("#responseMsg").addClass("hidden");
- isSubsystemDirty();
- updateServiceControlUI('monit');
- if (data.result) {
- $("#responseMsg").html(data['result']);
- $("#responseMsg").removeClass("hidden");
- }
- $('#btnImportSystemNotificationProgress').removeClass("fa fa-spinner fa-pulse");
- $('#btnImportSystemNotification').blur();
- ajaxCall("/api/monit/service/status", {}, function(data,status) {
- mapDataToFormUI({'frm_GeneralSettings':"/api/monit/settings/getGeneral/"}).done(function(){
- formatTokenizersUI();
- $('.selectpicker').selectpicker('refresh');
- isSubsystemDirty();
- updateServiceControlUI('monit');
- });
- });
- });
- });
/**
* general settings
@@ -297,9 +266,6 @@ POSSIBILITY OF SUCH DAMAGE.
-