mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-04-26 04:11:12 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #515 from bergware/master

Browse Source 
Dashboard: fixed VPN tunnels up/down count
This commit is contained in:
tom mortensen
2019-09-10 10:47:06 -07:00
committed by GitHub
parent 01bd18b46f 10f9a8773e
commit 732eb160fe
2 changed files with 65 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/ArrayOperation.page
+63 -14
View File
@@ -3,8 +3,8 @@ Title="Array Operation"
Tag="snowflake-o"
---
<?PHP
/* Copyright 2005-2018, Lime Technology
* Copyright 2012-2018, Bergware International.
/* Copyright 2005-2019, Lime Technology
* Copyright 2012-2019, Bergware International.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2,
@@ -15,6 +15,7 @@ Tag="snowflake-o"
*/
?>
<?
$keyfile = file_exists($var['luksKeyfile']);
$encrypt = false;
/* only one of $forced, $missing, or $wrong will be true, or all will be false */
$forced = $missing = $wrong = false;
@@ -117,23 +118,61 @@ function getFileContent(event,form) {
reader.onload = function(){form.file.value=reader.result;selectInput(form);};
reader.readAsDataURL(input.files[0]);
}
function base64(text) {
var xlat = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/';
var size = text.length;
var tail = size % 3;
var code = '';
var l, t, x;
function encode(i) {
return xlat.charAt(i & 0x3F);
}
function shift(n) {
return encode(n >> 18) + encode(n >> 12) + encode(n >> 6) + encode(n);
}
for (x=0, l=size-tail; x<l; x+=3) {
code += shift((text.charCodeAt(x) << 16) + (text.charCodeAt(x+1) << 8) + text.charCodeAt(x+2));
}
switch (tail) {
case 1:
t = text.charCodeAt(size-1);
code += encode(t >> 2);
code += encode(t << 4);
code += '==';
break;
case 2:
t = (text.charCodeAt(size-2) << 8) + text.charCodeAt(size-1);
code += encode(t >> 10);
code += encode(t >> 4);
code += encode(t << 2);
code += '=';
break;
}
return code;
}
function prepareInput(form) {
$(form).append('<input type="hidden" name="cmdStart" value="Start">');
if (form.input === undefined) {
form.submit();
} else {
var data = {};
data['#file'] = 'unused';
data['#include'] = 'webGui/include/KeyUpload.php';
data['text'] = form.text.value;
data['file'] = form.file.value;
form.input.disabled = true;
form.local.disabled = true;
form.file.disabled = true;
form.text.disabled = true;
form.copy.disabled = true;
$.post('/update.php',data,function(){form.submit();});
return;
}
form.input.disabled = true;
form.local.disabled = true;
form.file.disabled = true;
form.text.disabled = true;
form.copy.disabled = true;
var text = base64(form.text.value);
if (text) {
$(form).append('<input type="hidden" name="luksKey" value="'+text+'">');
form.submit();
return;
}
var data = {};
data['#file'] = 'unused';
data['#include'] = 'webGui/include/KeyUpload.php';
data['file'] = form.file.value;
$.post('/update.php',data,function(){form.submit();});
}
function parityWarning(form) {
if (form.md_invalidslot.checked) {
@@ -480,6 +519,16 @@ $(function(){
<tr><td></td><td class="line" colspan="2"></td></tr>
</table>
</form>
<?if ($keyfile):?>
<form name="delete_keyfile" method="POST" action="/update.php" target="progressFrame">
<input type="hidden" name="#file" value="unused">
<input type="hidden" name="#include" value="webGui/include/KeyUpload.php">
<table class="array_status noshift">
<tr><td></td><td><input type="submit" name="#apply" value="Delete" disabled></td><td><strong>Delete</strong> will delete the encryption keyfile.
<br><input type="checkbox" onchange="toggleApply(this.checked)"><small>Yes I want to do this</small></td></tr>
</table>
</form>
<?endif;?>
<?
if (isset($display['sleep'])) @include $display['sleep'];
?>
plugins/dynamix/DashStats.page
+2 -2
View File
@@ -172,7 +172,7 @@ div.left{float:left;width:66%;margin-top:-12px}
div.right{float:right;margin:-12px 20px 0 0;text-align:center}
span.ctrl{float:right;margin-right:10px}
span.outer{float:left}
span.inner{width:134px}
span.inner{width:155px}
span.ups{width:124px;display:inline-block}
span.busy,i.inactive{opacity:0.5}
span#inbound{width:75px;display:inline-block}
@@ -582,7 +582,7 @@ function toggleVPN(id,vtun) {
var up = $('#vpn-active');
var down = $('#vpn-inactive');
if (id.hasClass('inactive')) {
$.post('/webGui/include/update.wireguard.php',{'#cmd':'toggle','#wg':'start','#vtun':vtun},function(up){if (up){
$.post('/webGui/include/update.wireguard.php',{'#cmd':'toggle','#wg':'start','#vtun':vtun},function(on){if (on){
id.removeClass('inactive');
up.text(up.text()*1+1);
if (down.text()>0) down.text(down.text()*1-1);