diff --git a/api/v1/overview.php b/api/v1/overview.php index aa6c703..a0ad45e 100644 --- a/api/v1/overview.php +++ b/api/v1/overview.php @@ -1,67 +1,69 @@ addData('startTime', formatTime(time() - rpi_getRuntime())); - break; - case 'runtime': - $api->addData('runtime', getDateFormat(rpi_getRuntime())); - break; - case 'cpuClock': - $api->addData('cpuClock', rpi_getCpuClock()); - break; - case 'cpuLoad': - $api->addData('cpuLoad', rpi_getCpuLoad(true)); - break; - case 'cpuTemp': - $api->addData('cpuTemp', numberFormat(rpi_getCoreTemprature())); - break; - case 'ramPercentage': - $ram = rpi_getMemoryUsage(); - $api->addData('ramPercentage', $ram['percent']); - break; - case 'memoryUsed': - $memory = rpi_getMemoryInfo(); - $api->addData('memoryUsed', sizeUnit($memory[count($memory)-1]['used'])); - break; - case 'memoryFree': - $memory = rpi_getMemoryInfo(); - $api->addData('memoryFree', sizeUnit($memory[count($memory)-1]['free'])); - break; - case 'memoryTotal': - $memory = rpi_getMemoryInfo(); - $api->addData('memoryTotal', sizeUnit($memory[count($memory)-1]['total'])); - break; - case 'memoryPercent': - $memory = rpi_getMemoryInfo(); - $api->addData('memoryPercent', $memory[count($memory)-1]['percent']); - break; - case 'devices': - $api->addData('devices', rpi_getUsbDevices()); - break; - default: - $api->setError('error', 'Data for "'.$data.'" are not available.'); - break 2; - } - } -} -else + setData($datas, $api); +} elseif (isset($_GET['data'])) { + $datas = explode(';', $_GET['data']); + setData($datas, $api); +} else $api->setError('error', 'No data set.'); $api->display(); -?> \ No newline at end of file + +function setData($datas, $api) +{ + foreach ($datas as $data) { + switch ($data) { + case 'startTime': + $api->addData('startTime', formatTime(time() - rpi_getRuntime())); + break; + case 'runtime': + $api->addData('runtime', getDateFormat(rpi_getRuntime())); + break; + case 'cpuClock': + $api->addData('cpuClock', rpi_getCpuClock()); + break; + case 'cpuLoad': + $api->addData('cpuLoad', rpi_getCpuLoad(false)); + break; + case 'cpuTemp': + $api->addData('cpuTemp', numberFormat(rpi_getCoreTemprature())); + break; + case 'ramPercentage': + $ram = rpi_getMemoryUsage(); + $api->addData('ramPercentage', $ram['percent']); + break; + case 'memoryUsed': + $memory = rpi_getMemoryInfo(); + $api->addData('memoryUsed', sizeUnit($memory[count($memory) - 1]['used'])); + break; + case 'memoryFree': + $memory = rpi_getMemoryInfo(); + $api->addData('memoryFree', sizeUnit($memory[count($memory) - 1]['free'])); + break; + case 'memoryTotal': + $memory = rpi_getMemoryInfo(); + $api->addData('memoryTotal', sizeUnit($memory[count($memory) - 1]['total'])); + break; + case 'memoryPercent': + $memory = rpi_getMemoryInfo(); + $api->addData('memoryPercent', $memory[count($memory) - 1]['percent']); + break; + case 'devices': + $api->addData('devices', rpi_getUsbDevices()); + break; + default: + $api->setError('error', 'Data for "' . $data . '" are not available.'); + break 2; + } + } +} diff --git a/public_html/js/overview.status_refresh.js b/public_html/js/overview.status_refresh.js index 0019953..e92e6ea 100644 --- a/public_html/js/overview.status_refresh.js +++ b/public_html/js/overview.status_refresh.js @@ -1,138 +1,102 @@ var is_loding = false; -function overviewStatusRefreshEffect(element) -{ - element.css({'transition': 'background-color 0.5s', 'background-color': 'rgba(243, 255, 164, 1)'}); - setTimeout(function(){ - element.css({'background-color': 'transparent'}); +function overviewStatusRefreshEffect(element) { + element.css({ 'transition': 'background-color 0.5s', 'background-color': 'rgba(243, 255, 164, 1)' }); + setTimeout(function () { + element.css({ 'background-color': 'transparent' }); }, 800); } -function showError() -{ +function showError() { jQuery('.error-msg-refresh-bar').remove(); jQuery('.flex-box-refresh div:eq(0)').after('
' + _t('Fehler!') + '
'); jQuery('.refresh-bar').stop(false, true).css('width', 0); jQuery('a[href=#refresh] img').removeClass('rotate-icon'); - + setTimeout('overviewStatusRefresh()', 3000); } -function overviewStatusRefresh() -{ +function overviewStatusRefresh() { jQuery('.error-msg-refresh-bar').remove(); - jQuery('.refresh-bar').animate({width: '100%'}, reload_timeout, 'linear', function(e) - { - var this_ = jQuery(this); - var runtime = jQuery('.flex-container > div:eq(2)'); - var cpuClock = jQuery('.flex-container > div:eq(3)'); - var cpuLoad = jQuery('.flex-container > div:eq(4)'); - var cpuTemp = jQuery('.flex-container > div:eq(5)'); - var ramPercentage = jQuery('.flex-container > div:eq(6)'); - var memoryUsed = jQuery('.flex-container > div:eq(7)'); - var memoryFree = jQuery('.flex-container > div:eq(8)'); - var memoryTotal = jQuery('.flex-container > div:eq(9)'); - + jQuery('.refresh-bar').animate({ width: '100%' }, reload_timeout, 'linear', function (e) { + let this_ = jQuery(this); + let runtime = jQuery('.flex-container > div:eq(2)'); + let cpuClock = jQuery('.flex-container > div:eq(3)'); + let cpuLoad = jQuery('.flex-container > div:eq(4)'); + let cpuTemp = jQuery('.flex-container > div:eq(5)'); + let ramPercentage = jQuery('.flex-container > div:eq(6)'); + let memoryUsed = jQuery('.flex-container > div:eq(7)'); + let memoryFree = jQuery('.flex-container > div:eq(8)'); + let memoryTotal = jQuery('.flex-container > div:eq(9)'); + jQuery('a[href=#refresh] img').addClass('rotate-icon'); - - this_.animate({width: '88.8%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'runtime' }, function(data) - { - if (runtime.find('span').html() != data.data.runtime) - { + + this_.animate({ width: '88.8%' }, 300, 'linear'); + jQuery.get('api/v1/overview.php', { data: 'runtime;cpuClock;cpuLoad;cpuTemp;ramPercentage;memoryUsed;memoryFree;memoryTotal' }, function (data) { + if (runtime.find('span').html() != data.data.runtime) { overviewStatusRefreshEffect(runtime); runtime.find('span').html(data.data.runtime); } - - this_.animate({width: '77.7%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'cpuClock' }, function(data) - { - if (cpuClock.find('span').html() != data.data.cpuClock+' MHz') - { - overviewStatusRefreshEffect(cpuClock); - cpuClock.find('span').html(data.data.cpuClock+' MHz'); - } - - this_.animate({width: '66.6%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'cpuLoad' }, function(data) - { - if (cpuLoad.find('.progressbar div').html() != data.data.cpuLoad+'%') - { - overviewStatusRefreshEffect(cpuLoad); - cpuLoad.find('.progressbar').attr('data-text', data.data.cpuLoad+'%').find('div').css('width', data.data.cpuLoad+'%'); - } - - this_.animate({width: '55.5%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'cpuTemp' }, function(data) - { - if (cpuTemp.find('span').html() != data.data.cpuTemp+' °C') - { - overviewStatusRefreshEffect(cpuTemp); - cpuTemp.find('span').html(data.data.cpuTemp+' °C'); - } - - this_.animate({width: '44.4%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'ramPercentage' }, function(data) - { - if (ramPercentage.find('.progressbar div').html() != data.data.ramPercentage+'%') - { - overviewStatusRefreshEffect(ramPercentage); - ramPercentage.find('.progressbar').attr('data-text', data.data.ramPercentage+'%').find('div').css('width', data.data.ramPercentage+'%'); - } - - this_.animate({width: '33.3%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'memoryUsed' }, function(data) - { - if (memoryUsed.find('span').html() != data.data.memoryUsed) - { - overviewStatusRefreshEffect(memoryUsed); - memoryUsed.find('span').html(data.data.memoryUsed); - } - - this_.animate({width: '22.2%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'memoryFree' }, function(data) - { - if (memoryFree.find('span').html() != data.data.memoryFree) - { - overviewStatusRefreshEffect(memoryFree); - memoryFree.find('span').html(data.data.memoryFree); - } - - this_.animate({width: '11.1%'}, 300, 'linear'); - jQuery.post('api/v1/overview.php', { data: 'memoryTotal' }, function(data) - { - if (memoryTotal.find('span').html() != data.data.memoryTotal) - { - overviewStatusRefreshEffect(memoryTotal); - memoryTotal.find('span').html(data.data.memoryTotal); - } - - this_.animate({width: '0%'}, 300, 'linear', function(e) { - is_loding = false; - jQuery('a[href=#refresh] img').removeClass('rotate-icon'); - }); - - overviewStatusRefresh(); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); - }).fail(function(e) { showError(); }); + + this_.animate({ width: '77.7%' }, 300, 'linear'); + if (cpuClock.find('span').html() != data.data.cpuClock + ' MHz') { + overviewStatusRefreshEffect(cpuClock); + cpuClock.find('span').html(data.data.cpuClock + ' MHz'); + } + + this_.animate({ width: '66.6%' }, 300, 'linear'); + if (cpuLoad.find('.progressbar div').html() != data.data.cpuLoad + '%') { + overviewStatusRefreshEffect(cpuLoad); + cpuLoad.find('.progressbar').attr('data-text', data.data.cpuLoad + '%').find('div').css('width', data.data.cpuLoad + '%'); + } + + this_.animate({ width: '55.5%' }, 300, 'linear'); + if (cpuTemp.find('span').html() != data.data.cpuTemp + ' °C') { + overviewStatusRefreshEffect(cpuTemp); + cpuTemp.find('span').html(data.data.cpuTemp + ' °C'); + } + + this_.animate({ width: '44.4%' }, 300, 'linear'); + if (ramPercentage.find('.progressbar div').html() != data.data.ramPercentage + '%') { + overviewStatusRefreshEffect(ramPercentage); + ramPercentage.find('.progressbar').attr('data-text', data.data.ramPercentage + '%').find('div').css('width', data.data.ramPercentage + '%'); + } + + this_.animate({ width: '33.3%' }, 300, 'linear'); + if (memoryUsed.find('span').html() != data.data.memoryUsed) { + overviewStatusRefreshEffect(memoryUsed); + memoryUsed.find('span').html(data.data.memoryUsed); + } + + this_.animate({ width: '22.2%' }, 300, 'linear'); + if (memoryFree.find('span').html() != data.data.memoryFree) { + overviewStatusRefreshEffect(memoryFree); + memoryFree.find('span').html(data.data.memoryFree); + } + + this_.animate({ width: '11.1%' }, 300, 'linear'); + if (memoryTotal.find('span').html() != data.data.memoryTotal) { + overviewStatusRefreshEffect(memoryTotal); + memoryTotal.find('span').html(data.data.memoryTotal); + } + + this_.animate({ width: '0%' }, 300, 'linear', function (e) { + is_loding = false; + jQuery('a[href=#refresh] img').removeClass('rotate-icon'); + }); + + overviewStatusRefresh(); + }).fail(function (e) { showError(); }); }); } -jQuery(document).on('click', 'a[href=#refresh]', function(e) -{ +jQuery(document).on('click', 'a[href=#refresh]', function (e) { if (is_loding == false) jQuery('.refresh-bar').stop(false, true); - + return false; }); -jQuery(document).ready(function(e) -{ +jQuery(document).ready(function (e) { overviewStatusRefresh(); }); \ No newline at end of file diff --git a/public_html/templates/html_footer.tpl.php b/public_html/templates/html_footer.tpl.php index 90d41b6..b5a4a63 100644 --- a/public_html/templates/html_footer.tpl.php +++ b/public_html/templates/html_footer.tpl.php @@ -22,7 +22,7 @@ der %s.', 'Raspberry Pi Foundation'); ?> - + diff --git a/resources/library/main/rpi.function.php b/resources/library/main/rpi.function.php index 50d2b59..bfffb98 100644 --- a/resources/library/main/rpi.function.php +++ b/resources/library/main/rpi.function.php @@ -3,14 +3,12 @@ if (!defined('PICONTROL')) exit(); function rpi_getRuntime() { - $runtime = trim(@shell_exec('cat /proc/uptime | awk -F \'.\' \'{print $1}\'')); - return $runtime; + return trim(@shell_exec('cat /proc/uptime | awk -F \'.\' \'{print $1}\'')); } function rpi_getHostname() { - $host = trim(@shell_exec('cat /proc/sys/kernel/hostname')); - return $host; + return trim(@shell_exec('cat /proc/sys/kernel/hostname')); } function rpi_getHostAddr() @@ -75,28 +73,27 @@ function rpi_getCPUType() if (isset($match[1])) return $match[1]; - return NULL; + return null; } function rpi_getCpuModel() { - $model = trim(@shell_exec('cat /proc/cpuinfo | grep -m 1 "Model" | cut -d ":" -f 2')); - return $model; + return trim(@shell_exec('cat /proc/cpuinfo | grep -m 1 "Model" | cut -d ":" -f 2')); } function rpi_getCPULoad($accurate = false, $mulitcore = false) { - $return = NULL; + $return = null; if ($accurate === true) $file = shell_exec('cat /proc/stat; sleep 2; echo "##--##"; cat /proc/stat'); else - $file = shell_exec('cat /proc/stat; sleep 0.5; echo "##--##"; cat /proc/stat'); + $file = shell_exec('cat /proc/stat; echo "##--##"; cat /proc/stat'); $file = explode('##--##', $file); if (!isset($file[0], $file[1])) - return NULL; + return null; preg_match_all('/^cpu[0-9]?(.*)$/im', $file[0], $prevCPUStrings); preg_match_all('/^cpu[0-9]?(.*)$/im', $file[1], $curCPUStrings); @@ -110,7 +107,7 @@ function rpi_getCPULoad($accurate = false, $mulitcore = false) if (!isset($prevCPU[0], $curCPU[1]) || count($prevCPU) != 11 || count($curCPU) != 11) - return NULL; + return null; $prevIdle = $prevCPU[4] + $prevCPU[5]; $curIdle = $curCPU[4] + $curCPU[5]; @@ -124,7 +121,7 @@ function rpi_getCPULoad($accurate = false, $mulitcore = false) $total = $curTotal - $prevTotal; $idle = $curIdle - $prevIdle; - if ($mulitcore == true) + if ($mulitcore) $return[$prevCPU[0]] = (int) round(($total - $idle) / $total * 100); else $return = (int) round(($total - $idle) / $total * 100); @@ -153,20 +150,17 @@ function rpi_getDistribution() function rpi_getKernelVersion() { - $kernel = trim(@shell_exec('cat /proc/version | cut -d " " -f 1,3')); - return $kernel; + return trim(@shell_exec('cat /proc/version | cut -d " " -f 1,3')); } function rpi_getCountRunningTasks() { - $tasks = trim(@shell_exec('ps -auxeaf| wc -l')); - return $tasks; + return trim(@shell_exec('ps -auxeaf| wc -l')); } function rpi_getCountInstalledPackages() { - $packages = trim(@shell_exec('dpkg --get-selections | grep -v deinstall | wc -l')); - return $packages; + return trim(@shell_exec('dpkg --get-selections | grep -v deinstall | wc -l')); } function rpi_getInstalledPackages()