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

Replace fixed path with absolute path in docroot variable

Browse Source
This commit is contained in:
bergware
2016-10-24 09:30:54 +02:00
parent b7aed12d4f
commit 16dab2eafc
25 changed files with 147 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/scripts/disk_log
+2 -1
View File
@@ -14,7 +14,8 @@
<?
echo "<p style='text-align:center'><span class='error label'>Error</span><span class='warn label'>Warning</span><span class='system label'>System</span><span class='array label'>Array</span></p>\n";
require_once '/usr/local/emhttp/webGui/include/ColorCoding.php';
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/ColorCoding.php";
$ata = exec("ls -n /sys/block/{$argv[1]}|grep -Po 'ata\d+'");
$dev = $ata ? "${argv[1]}|${ata}[.:]" : $argv[1];
plugins/dynamix/scripts/monitor
+5 -4
View File
@@ -18,11 +18,12 @@ $disks = parse_ini_file("/var/local/emhttp/disks.ini",true);
$var = parse_ini_file("/var/local/emhttp/var.ini");
$devs = parse_ini_file("/var/local/emhttp/devs.ini",true);
require_once '/usr/local/emhttp/webGui/include/Wrappers.php';
require_once '/usr/local/emhttp/webGui/include/Preselect.php';
require_once '/usr/local/emhttp/webGui/include/CustomMerge.php';
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
require_once "$docroot/webGui/include/Preselect.php";
require_once "$docroot/webGui/include/CustomMerge.php";
$notify = "/usr/local/emhttp/webGui/scripts/notify";
$notify = "$docroot/webGui/scripts/notify";
$ram = "/var/local/emhttp/monitor.ini";
$rom = "/boot/config/plugins/dynamix/monitor.ini";
$saved = @parse_ini_file($ram,true);
plugins/dynamix/scripts/notify
+10 -9
View File
@@ -13,8 +13,9 @@
*/
?>
<?
require_once '/usr/local/emhttp/webGui/include/Wrappers.php';
require_once '/usr/local/emhttp/webGui/include/Encryption.php';
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
require_once "$docroot/webGui/include/Encryption.php";
function usage() {
echo <<<EOT
@@ -136,13 +137,13 @@ case 'smtp-init':
case 'cron-init':
@mkdir($unread,0755,true);
@mkdir($archive,0755,true);
$text = empty($notify['status']) ? "" : "# Generated array status check schedule:\n{$notify['status']} /usr/local/emhttp/plugins/dynamix/scripts/statuscheck &> /dev/null\n\n";
$text = empty($notify['status']) ? "" : "# Generated array status check schedule:\n{$notify['status']} $docroot/plugins/dynamix/scripts/statuscheck &> /dev/null\n\n";
parse_cron_cfg("dynamix", "status-check", $text);
$text = empty($notify['version']) ? "" : "# Generated plugins version check schedule:\n{$notify['version']} /usr/local/emhttp/plugins/dynamix.plugin.manager/scripts/plugincheck &> /dev/null\n\n";
$text = empty($notify['version']) ? "" : "# Generated plugins version check schedule:\n{$notify['version']} $docroot/plugins/dynamix.plugin.manager/scripts/plugincheck &> /dev/null\n\n";
parse_cron_cfg("dynamix", "plugin-check", $text);
$text = empty($notify['system']) ? "" : "# Generated system monitoring schedule:\n{$notify['system']} /usr/local/emhttp/plugins/dynamix/scripts/monitor &> /dev/null\n\n";
$text = empty($notify['system']) ? "" : "# Generated system monitoring schedule:\n{$notify['system']} $docroot/plugins/dynamix/scripts/monitor &> /dev/null\n\n";
parse_cron_cfg("dynamix", "monitor", $text);
$text = empty($notify['docker_update']) ? "" : "# Generated docker monitoring schedule:\n{$notify['docker_update']} /usr/local/emhttp/plugins/dynamix.docker.manager/scripts/dockerupdate.php check &> /dev/null\n\n";
$text = empty($notify['docker_update']) ? "" : "# Generated docker monitoring schedule:\n{$notify['docker_update']} $docroot/plugins/dynamix.docker.manager/scripts/dockerupdate.php check &> /dev/null\n\n";
parse_cron_cfg("dynamix", "docker-update", $text);
break;
@@ -206,9 +207,9 @@ case 'get':
$time = true;
foreach ($fields as $field) {
if (!$field) continue;
$item = explode('=', $field);
if ($time) {$item[1] = date("{$notify['date']} {$notify['time']}", $item[1]); $time = false;}
$output[$i][] = '\"'.trim($item[0]).'\":\"'.trim($item[1]).'\"';
list($key,$val) = explode('=', $field);
if ($time) {$val = date($notify['date'].' '.$notify['time'], $val); $time = false;}
$output[$i][] = '\"'.trim($key).'\":\"'.trim($val).'\"';
}
$output[$i++][] = '\"file\":\"'.basename($file).'\"';
chmod($file,0000);
plugins/dynamix/scripts/statuscheck
+6 -5
View File
@@ -12,10 +12,11 @@
*/
?>
<?
require_once '/usr/local/emhttp/webGui/include/Wrappers.php';
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/Wrappers.php";
exec("wget -qO /dev/null 127.0.0.1:$(lsof -i -P -sTCP:LISTEN|grep -Pom1 '^emhttp.*:\K\d+')/update.htm?cmdStatus=apply");
$notify = "/usr/local/emhttp/webGui/scripts/notify";
$notify = "$docroot/webGui/scripts/notify";
$disks = parse_ini_file("/var/local/emhttp/disks.ini",true);
$var = parse_ini_file("/var/local/emhttp/var.ini");
$unraid = parse_plugin_cfg("dynamix",true);
@@ -23,7 +24,7 @@ $output = $unraid['notify']['report'];
$hot = $unraid['display']['hot'];
$max = $unraid['display']['max'];
$server = strtoupper($var['NAME']);
$data = array();
$data = [];
$parity = false;
$cache = false;
$error0 = 0;
@@ -47,7 +48,7 @@ function my_scale($value, &$unit, $precision = NULL) {
global $unraid;
$scale = $unraid['display']['scale'];
$number = $unraid['display']['number'];
$units = array('B','KB','MB','GB','TB','PB');
$units = ['B','KB','MB','GB','TB','PB'];
if ($scale==0 && $precision===NULL) {
$unit = '';
return number_format($value, 0, $number[0], ($value>=10000 ? $number[1] : ''));
@@ -116,7 +117,7 @@ function my_array(&$disk) {
if ($fail) $fail .= ')';
$status = $fail ? ' [NOK]' : ' [OK]';
$color = strtok($disk['color'],'-');
if ($color=='red'||$color=='yellow') { $error3++; $status = ' ['.str_replace(array('NP_','_'),array('',' '),$disk['status']).']'; }
if ($color=='red'||$color=='yellow') { $error3++; $status = ' ['.str_replace(['NP_','_'],['',' '],$disk['status']).']'; }
$info = "{$disk['id']} ({$disk['device']})";
if ($info==" ()") $info = 'No device identification present';
$data[] = my_disk($name)." - $info".my_temp($temp).$fail.$status;
plugins/dynamix/scripts/tail_log
+2 -1
View File
@@ -14,7 +14,8 @@
<?
echo "<p style='text-align:center'><span class='error label'>Error</span><span class='warn label'>Warning</span><span class='system label'>System</span><span class='array label'>Array</span><span class='login label'>Login</span></p>\n";
require_once '/usr/local/emhttp/webGui/include/ColorCoding.php';
$docroot = $docroot ?: @$_SERVER['DOCUMENT_ROOT'] ?: '/usr/local/emhttp';
require_once "$docroot/webGui/include/ColorCoding.php";
$handle = popen('/usr/bin/tail -n 40 -f '.escapeshellarg("/var/log/{$argv[1]}").' 2>&1', 'r');
while (!feof($handle)) {