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

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
bergware
2018-09-05 08:00:49 +02:00
parent 712a49bc96 3d4e13fe5b
commit a2838d597f
22 changed files with 61 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/DashboardApps.page
+2 -2
View File
@@ -7,8 +7,8 @@ Markdown="false"
<?
$width = strstr('white,black',$display['theme']) ? -58: -44;
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.ui.css">
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.ui.css')?>">
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
<style>
body{-webkit-overflow-scrolling:touch}
label{display:inline}
plugins/dynamix/DisplaySettings.page
+1 -1
View File
@@ -26,7 +26,7 @@ span#dropbox{margin-right:20px;}
i.top{position:absolute;padding-left:4px;cursor:pointer;}
</style>
<script src="/webGui/javascript/jquery.filedrop.js"></script>
<script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
<script>
var path = '/boot/config/plugins/dynamix';
var filename = '';
plugins/dynamix/Syslinux.page
+1 -1
View File
@@ -33,7 +33,7 @@ $title = 'Global Configuration';
$menu = 'menu default';
$mark = 'label ';
?>
<link type="text/css" rel="stylesheet" href="/webGui/styles/jquery.switchbutton.css">
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/jquery.switchbutton.css')?>">
<style>
div.basic{display:block}
div.advanced{display:none}
plugins/dynamix/UserAdd.page
+1 -1
View File
@@ -33,7 +33,7 @@ span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;paddi
i.top{position:absolute;padding-top:4px;cursor:pointer;}
</style>
<script src="/webGui/javascript/jquery.filedrop.js"></script>
<script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
<script>
var path = '/boot/config/plugins/dynamix/users';
var filename = '';
plugins/dynamix/UserEdit.page
+1 -1
View File
@@ -40,7 +40,7 @@ span#dropbox{border:1px solid #1c1c1c;border-radius:5px;background:#e8e8e8;paddi
i.top{position:absolute;padding-top:4px;cursor:pointer;}
</style>
<script src="/webGui/javascript/jquery.filedrop.js"></script>
<script src="<?autov('/webGui/javascript/jquery.filedrop.js')?>"></script>
<script>
var path = '/boot/config/plugins/dynamix/users';
var filename = '';
plugins/dynamix/include/Boot.php
+6 -2
View File
@@ -11,17 +11,21 @@
*/
?>
<?
$docroot = $docroot ?? $_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Helpers.php";
$var = parse_ini_file("/var/local/emhttp/var.ini");
?>
<!DOCTYPE HTML>
<html>
<head>
<link type="text/css" rel="stylesheet" href="/webGui/styles/default-fonts.css">
<meta name="robots" content="noindex, nofollow">
<link type="text/css" rel="stylesheet" href="<?autov('/webGui/styles/default-fonts.css')?>">
<style>
div.notice{background-color:#FFF6BF;text-align:center;height:80px;line-height:80px;border-top:2px solid #FFD324;border-bottom:2px solid #FFD324;font-family:clear-sans;font-size:18px;}
span.title{font-size:28px;text-transform:uppercase;display:block;}
</style>
<script src="/webGui/javascript/dynamix.js"></script>
<script src="<?autov('/webGui/javascript/dynamix.js')?>"></script>
<script>
var start = new Date();
plugins/dynamix/include/CryptoBenchmark.php
+2 -2
View File
@@ -25,10 +25,10 @@ $hash = trim(explode(':',$hash)[1]);
<title>Benchmark</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="robots" content="noindex">
<meta name="robots" content="noindex, nofollow">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/font-awesome.css">)?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/font-awesome.css")?>">
<script src="<?autov("/webGui/javascript/dynamix.js")?>"></script>
<script>
var test = 'sha1,sha256,sha512,ripemd160,whirlpool,aes-cbc:128,serpent-cbc:128,twofish-cbc:128,aes-cbc:256,serpent-cbc:256,twofish-cbc:256,aes-xts:256,serpent-xts:256,twofish-xts:256,aes-xts:512,serpent-xts:512,twofish-xts:512';
plugins/dynamix/include/DefaultPageLayout.php
+1 -1
View File
@@ -17,7 +17,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="format-detection" content="telephone=no">
<meta name="robots" content="noindex,nofollow">
<meta name="robots" content="noindex, nofollow">
<link type="image/png" rel="shortcut icon" href="/webGui/images/<?=$var['mdColor']?>.png">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/font-awesome.css")?>">
plugins/dynamix/include/Feedback.php
+1 -1
View File
@@ -75,7 +75,7 @@ input[type=email]{margin-top:8px;float:left}
<a href="https://lime-technology.com/wiki" target="_blank">Wiki</a>
</div>
</div>
<script type="text/javascript" src="/webGui/javascript/dynamix.js"></script>
<script type="text/javascript" src="<?autov('/webGui/javascript/dynamix.js')?>"></script>
<script>
var keyfile = '<?=$keyfile?>';
var unraid_osversion = '<?=$unraid['version']?>';
plugins/dynamix/include/ParityHistory.php
+1
View File
@@ -32,6 +32,7 @@ function his_duration($time) {
<!DOCTYPE html>
<html lang="en">
<head>
<meta name="robots" content="noindex, nofollow">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
</head>
plugins/dynamix/include/ReplaceKey.php
+1 -1
View File
@@ -18,7 +18,7 @@ $keyfile = base64_encode(file_get_contents($var['regFILE']));
?>
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
<script src="/webGui/javascript/dynamix.js"></script>
<script src="<?autov('/webGui/javascript/dynamix.js')?>"></script>
<script>
function replaceKey(email, guid, keyfile) {
if (email.length) {
plugins/dynamix/include/TrialRequest.php
+1 -1
View File
@@ -17,7 +17,7 @@ $var = parse_ini_file('state/var.ini');
?>
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-fonts.css")?>">
<link type="text/css" rel="stylesheet" href="<?autov("/webGui/styles/default-popup.css")?>">
<script src="/webGui/javascript/dynamix.js"></script>
<script src="<?autov('/webGui/javascript/dynamix.js')?>"></script>
<script>
function registerTrial(email, guid) {
if (email.length) {
plugins/dynamix/scripts/diagnostics
+1
View File
@@ -25,6 +25,7 @@ $folders = ['/boot','/boot/config','/boot/config/plugins','/boot/extra','/boot/s
function exert($cmd, &$save=null) {
// execute command with timeout of 30s
exec("timeout -s9 30 $cmd", $save);
return implode("\n",$save);
}
function anonymize($text,$select) {