lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-17 18:14:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

work in progress proxy feature

Browse Source
This commit is contained in:
Ad Schellevis 2015-03-09 16:29:16 +01:00
parent e6fce62280
commit cdf027678d
4 changed files with 54 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/opnsense/mvc/app/controllers/OPNsense/Proxy/Api/ServiceController.php
View File

@ -91,4 +91,23 @@ class ServiceController extends ApiControllerBase
return array("status" => $status);
}
/**
* reconfigure squid, generate config and reload
*/
public function reconfigureAction()
{
$backend = new Backend();
$backend->sendEvent("template reload OPNsense.Proxy");
$runStatus = $this->statusAction();
if ($runStatus == "running") {
$backend->sendEvent("service reconfigure proxy");
} else {
$this->startAction();
}
return array("status" => "ok");
}
}

1
src/opnsense/mvc/app/controllers/OPNsense/Proxy/IndexController.php
View File

@ -36,6 +36,7 @@ class IndexController extends \OPNsense\Base\IndexController
{
public function indexAction()
{
$this->view->title = "Proxy";
$this->view->pick('OPNsense/Proxy/index');
}
}

45
src/opnsense/mvc/app/views/OPNsense/Proxy/index.volt
View File

@ -10,24 +10,26 @@
// form event handlers
$("#save").click(function(){
data = getFormData("frm_general");
ajaxCall(url="/api/proxy/settings/set",sendData=data,callback=function(data,status){
if ( status == "success") {
handleFormValidation("frm_general",data['validations']);
if (data['validations'] != undefined) {
saveFormToEndpoint(url="/api/proxy/settings/set",formid="frm_general",callback_ok=function(){
// on correct save, perform reconfigure. set progress animation when reloading
$("#frm_general_progress").addClass("fa fa-spinner fa-pulse");
//
ajaxCall(url="/api/proxy/service/reconfigure", sendData={}, callback=function(data,status){
// when done, disable progress animation.
$("#frm_general_progress").removeClass("fa fa-spinner fa-pulse");
if (status != "success" || data['status'] != 'ok' ) {
// fix error handling
BootstrapDialog.show({
type:BootstrapDialog.TYPE_WARNING,
title: 'Input validation',
message: 'Please correct validation errors in form'
title: 'Proxy',
message: JSON.stringify(data)
});
}
}
// TODO: implement error handling
//alert(status);
});
});
});
});
@ -42,24 +44,29 @@
<div class="content-box tab-content">
<div id="tabGeneral" class="tab-pane fade in active">
<form id="frm_general" class="form-inline">
<table class="table table-striped">
<table class="table table-striped table-condensed table-responsive">
<colgroup>
<col class="col-md-3">
<col class="col-md-4">
<col class="col-md-5">
<col class="col-md-3"/>
<col class="col-md-4"/>
<col class="col-md-5"/>
</colgroup>
<tbody>
{{ partial("layout_partials/form_input_tr",
['id': 'general.enabled',
'label':'enabled',
'type':'checkbox',
'help':'gfvjhgghfh'
'help':'test'
])
}}
{{ partial("layout_partials/form_input_tr",
['id': 'general.port',
'label':'port',
'type':'text'
])
}}
{{ partial("layout_partials/form_input_tr", ['id': 'general.port','label':'test','type':'text']) }}
<tr>
<td colspan="3"><button class="btn btn-primary" id="save" type="button">Save</button></td>
<td colspan="3"><button class="btn btn-primary" id="save" type="button">Apply <i id="frm_general_progress" class=""></i></button></td>
</tr>
</tbody>
</table>

11
src/opnsense/www/js/opnsense_ui.js
View File

@ -7,20 +7,25 @@
* @param url endpoint url
* @param formid parent id to grep input data from
*/
function saveFormToEndpoint(url,formid) {
function saveFormToEndpoint(url,formid,callback_ok) {
data = getFormData(formid);
ajaxCall(url=url,sendData=data,callback=function(data,status){
if ( status == "success") {
// update field validation
handleFormValidation(formid,data['validations']);
// if there are validation issues, update our screen and show a dialog.
if (data['validations'] != undefined) {
// update field validation
handleFormValidation(formid,data['validations']);
BootstrapDialog.show({
type:BootstrapDialog.TYPE_WARNING,
title: 'Input validation',
message: 'Please correct validation errors in form'
});
} else if ( callback_ok != undefined ) {
// execute callback function
callback_ok();
}
} else {
// error handling, show internal errors
// Normally the form should only return validation issues, if other things go wrong throw an error.