diff options
author | Jannik Schönartz | 2018-03-13 12:32:38 +0100 |
---|---|---|
committer | Jannik Schönartz | 2018-03-13 12:32:38 +0100 |
commit | fe8d7bc73fee42fa5aad344a7ed88acca5a7a94f (patch) | |
tree | 76333f04dc09379b9e2809381c128d8bbd8c1182 | |
parent | [usb-lock-off] Big rework. Moved from client side (modal) stuff to server sid... (diff) | |
download | slx-admin-fe8d7bc73fee42fa5aad344a7ed88acca5a7a94f.tar.gz slx-admin-fe8d7bc73fee42fa5aad344a7ed88acca5a7a94f.tar.xz slx-admin-fe8d7bc73fee42fa5aad344a7ed88acca5a7a94f.zip |
[usb-lock-off] Fixed add generic rule.
-rw-r--r-- | modules-available/usblockoff/page.inc.php | 2 | ||||
-rw-r--r-- | modules-available/usblockoff/templates/usb-add-generic-rule.html | 255 |
2 files changed, 133 insertions, 124 deletions
diff --git a/modules-available/usblockoff/page.inc.php b/modules-available/usblockoff/page.inc.php index 5cfb0ec3..13414d8d 100644 --- a/modules-available/usblockoff/page.inc.php +++ b/modules-available/usblockoff/page.inc.php @@ -62,6 +62,8 @@ class Page_usblockoff extends Page $configid = Request::any('configid', 0, 'int'); $rules = json_decode(Request::post('rules', '', 'string'), true); + + error_log(json_encode($rules)); foreach ($rules as $rule) { $rid = (int)$rule['id']; if($rid == 0) { diff --git a/modules-available/usblockoff/templates/usb-add-generic-rule.html b/modules-available/usblockoff/templates/usb-add-generic-rule.html index 77b5f13e..2d579244 100644 --- a/modules-available/usblockoff/templates/usb-add-generic-rule.html +++ b/modules-available/usblockoff/templates/usb-add-generic-rule.html @@ -1,154 +1,159 @@ -<div> - <form method="post" action="?do=usblockoff" id="addGenericRuleForm"> - <input type="hidden" name="token" value="{{token}}"> - <input type="hidden" name="action" value="addGenericRule"> +<form method="post" action="?do=usblockoff" id="addGenericRuleForm"> + <input type="hidden" name="token" value="{{token}}"> + <!--<input type="hidden" name="action" value="addGenericRule">--> + <input type="hidden" name="action" value="addDevices"> + <input type="hidden" name="rules" value="" id="rules"> + <input type="hidden" name="configid" value="{{configid}}" id="configid"> - <div class="panel panel-default"> - <div class="panel-heading">{{lang_generalOptions}}</div> - <div class="panel-body"> - <div class="list-group"> - {{#settings}} - {{{settingHtml}}} - {{/settings}} + <div class="panel panel-default"> + <div class="panel-heading">{{lang_generalOptions}}</div> + <div class="panel-body"> + <div class="list-group"> - </div> - </div> - </div> + {{#settings}} + {{{settingHtml}}} + {{/settings}} - <div class="panel panel-default"> - <div class="panel-heading">{{lang_modeOptions}} - <!-- - <input class="settings-bs-switch" id="expert_Switch" type="checkbox" name="expert_Switch" - data-on-text="Expert" data-off-text="Casual" data-size="small"> - --> </div> - <div class="panel-body"> - <div class="list-group"> - - <div id="casualMode"> - - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_deviceClasses}}</label></div> - <div class="col-md-7"> - <select class="form-control" id="casual_selected"> - <option value="08:*:*" selected>{{lang_mass-storage}}</option> - <option value="03:*:*">{{lang_hid}}</option> - <option value="09:*:*">{{lang_hub}}</option> - <option value="07:*:*">{{lang_printer}}</option> - <option value="01:*:*">{{lang_audio}}</option> - <option value="*:*:*">{{lang_all-devices}}</option> - </select> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_classes-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + </div> + </div> + + <div class="panel panel-default"> + <div class="panel-heading">{{lang_modeOptions}} + <!-- + <input class="settings-bs-switch" id="expert_Switch" type="checkbox" name="expert_Switch" + data-on-text="Expert" data-off-text="Casual" data-size="small"> + --> + </div> + <div class="panel-body"> + <div class="list-group"> + + <div id="casualMode"> + + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_deviceClasses}}</label></div> + <div class="col-md-7"> + <select class="form-control" id="casual_selected"> + <option value="08:*:*" selected>{{lang_mass-storage}}</option> + <option value="03:*:*">{{lang_hid}}</option> + <option value="09:*:*">{{lang_hub}}</option> + <option value="07:*:*">{{lang_printer}}</option> + <option value="01:*:*">{{lang_audio}}</option> + <option value="*:*:*">{{lang_all-devices}}</option> + </select> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_classes-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> + </div> - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_contains}}</label></div> - <div class="col-md-7"> - <input class="settings-bs-switch" id="contains" type="checkbox" value="1" checked - data-size="small"> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_contains-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_contains}}</label></div> + <div class="col-md-7"> + <input class="settings-bs-switch" id="contains" type="checkbox" value="1" checked + data-size="small"> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_contains-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> - </div> - <!-- - <div id="expertMode" style="display: none;"> - - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_operator}}</label></div> - <div class="col-md-7"> - <select class="form-control" id="expert_selected"> - <option value="all-of">{{lang_all-of}}</option> - <option value="one-of">{{lang_one-of}}</option> - <option value="none-of">{{lang_none-of}}</option> - <option value="equals" selected>{{lang_equals}}</option> - <option value="equals-ordered">{{lang_equals-ordered}}</option> - </select> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_operator-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + </div> + + <!-- + <div id="expertMode" style="display: none;"> + + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_operator}}</label></div> + <div class="col-md-7"> + <select class="form-control" id="expert_selected"> + <option value="all-of">{{lang_all-of}}</option> + <option value="one-of">{{lang_one-of}}</option> + <option value="none-of">{{lang_none-of}}</option> + <option value="equals" selected>{{lang_equals}}</option> + <option value="equals-ordered">{{lang_equals-ordered}}</option> + </select> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_operator-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> + </div> - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_deviceClass}}</label></div> - <div class="col-md-7"> - <input class="form-control" type="input" id="input_deviceClass" - value=""> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_deviceClass-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_deviceClass}}</label></div> + <div class="col-md-7"> + <input class="form-control" type="input" id="input_deviceClass" + value=""> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_deviceClass-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> + </div> - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_deviceSubClass}}</label></div> - <div class="col-md-7"> - <input class="form-control" type="input" id="input_deviceSubClass" - value=""> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_deviceSubClass-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_deviceSubClass}}</label></div> + <div class="col-md-7"> + <input class="form-control" type="input" id="input_deviceSubClass" + value=""> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_deviceSubClass-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> + </div> - <div class="list-group-item"> - <div class="row"> - <div class="col-md-3"><label>{{lang_deviceProtocol}}</label></div> - <div class="col-md-7"> - <input class="form-control" type="input" id="input_deviceProtocol" - value=""> - </div> - <div class="col-md-2"> - <a class="btn btn-default" title="{{lang_deviceProtocol-helptext}}"> - <span class="glyphicon glyphicon-question-sign"></span> - </a> - </div> + <div class="list-group-item"> + <div class="row"> + <div class="col-md-3"><label>{{lang_deviceProtocol}}</label></div> + <div class="col-md-7"> + <input class="form-control" type="input" id="input_deviceProtocol" + value=""> + </div> + <div class="col-md-2"> + <a class="btn btn-default" title="{{lang_deviceProtocol-helptext}}"> + <span class="glyphicon glyphicon-question-sign"></span> + </a> </div> </div> - </div> ---> + </div> +--> </div> </div> + </div> + + <div class="pull-right"> + <a href="?do=usblockoff&show=edit-config&configid={{configid}}" class="btn btn-default">Cancel</a> + + <button id="addButton" class="btn btn-primary" type="submit" onclick="addRule();"> + <span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}} + </button> + </div> + +</form> - </form> -</div> -<div class="pull-right"> - <a href="?do=usblockoff&show=edit-config&configid={{configid}}" class="btn btn-default">Cancel</a> - <button type="submit" class="btn btn-primary"> - <span class="glyphicon glyphicon-floppy-disk"></span> {{lang_save}} - </button> -</div> <script type="text/javascript"> document.addEventListener("DOMContentLoaded", function(event) { @@ -183,7 +188,9 @@ } }); */ + function addRule() { + var rules = []; var rule = {}; rule['target'] = $('#prop-action').val(); rule['id'] = 0; @@ -192,7 +199,7 @@ attribute['value'] = $('#casual_selected option:selected').val(); rule['attributes'] = []; rule['attributes'].push(attribute); - - // TODO: SEND RULE TO PHO + rules.push(rule); + $('#rules').val(JSON.stringify(rules)); } </script>
\ No newline at end of file |