Umstellung auf GET Methoden

Zusammenfassen von Anfragen
Vorbereitungen SSH Login
2023-10-27 23:05:48 +02:00 · 2023-09-23 16:17:39 +02:00 · 2023-08-18 21:26:56 +02:00
11 changed files with 230 additions and 259 deletions
--- a/README.md
+++ b/README.md
@@ -4,4 +4,4 @@
 [Pi Control Installation](https://pi-control.de/install/)

 ## Bei Fragen oder Problemen
-Über das [Ticketsystem](https://bugs.die-schultes.eu/projects/pi-control/issues) können Fehler gemeldet werden und im [Forum](https://bugs.die-schultes.eu/projects/pi-control/boards) gibt es Hilfe zu Fragen rund um Pi Control
+Über das [Ticketsystem](https://git.schultes.dev/gregor/pi-control/issues) können Fehler gemeldet werden und im [Forum](https://bugs.die-schultes.eu/projects/pi-control/boards) gibt es Hilfe zu Fragen rund um Pi Control
--- a/api/v1/overview.php
+++ b/api/v1/overview.php
@@ -1,67 +1,69 @@
 <?php
 define('PICONTROL', true);

-(include_once realpath(dirname(__FILE__)).'/../../resources/init.php')	or die('Error: 0x0000');
-(include_once LIBRARY_PATH.'main/main.function.php')					or die('Error: 0x0001');
-(include_once LIBRARY_PATH.'main/rpi.function.php')						or die('Error: 0x0002');
-(include_once LIBRARY_PATH.'api/api.class.php')							or die('Error: 0x0003');
+(include_once realpath(dirname(__FILE__)) . '/../../resources/init.php')	or die('Error: 0x0000');
+(include_once LIBRARY_PATH . 'main/main.function.php')					or die('Error: 0x0001');
+(include_once LIBRARY_PATH . 'main/rpi.function.php')						or die('Error: 0x0002');
+(include_once LIBRARY_PATH . 'api/api.class.php')							or die('Error: 0x0003');

 $api = new API;

-if (isset($_POST['data']))
-{
+if (isset($_POST['data'])) {
 	$datas = explode(';', $_POST['data']);
-	
-	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(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();
-?>
+
+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;
+		}
+	}
+}
--- a/api/v1/ssh.php
+++ b/api/v1/ssh.php
@@ -111,4 +111,3 @@ if (isset($_POST['logout']))
 }

 $api->display();
-?>
--- a/api/versions.php
+++ b/api/versions.php
@@ -7,4 +7,3 @@ $apiVersions[0] = array('versioncode' => 1,
 						'date' => 1443909600);

 echo json_encode(array('versions' => $apiVersions, 'latest' => $apiLatest));
-?>
--- 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('<div class="red error-msg-refresh-bar" style="vertical-align: bottom; font-weight: bold;">' + _t('Fehler!') + '</div>');
 	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+' &deg;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 + ' &deg;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();
 });
--- a/public_html/templates/html_footer.tpl.php
+++ b/public_html/templates/html_footer.tpl.php
@@ -22,7 +22,7 @@
 					<td><strong><?php _e('LIZENZ'); ?></strong><span><?php _e('Raspberry Pi ist ein Markenzeichen<br />der %s.', '<a href="https://www.raspberrypi.org/" target="_blank">Raspberry Pi Foundation</a>'); ?></span></td>
 				</tr>
 			</table>
-			<div id="footer-copyright"><?php _e('Mit %s entwickelt von %s.', '<span style="color: #F44336;">&#10084;</span>', '<a href="https://willy-tech.de/" target="_blank">Willy Fritzsche</a>'); ?> 2013-2017 <br>Weiterentwickelt von <a href="https://www.schultes.dev">Gregor Schulte</a> 2021-2022</div>
+			<div id="footer-copyright"><?php _e('Mit %s entwickelt von %s.', '<span style="color: #F44336;">&#10084;</span>', '<a href="https://willy-tech.de/" target="_blank">Willy Fritzsche</a>'); ?> 2013-2017 <br>Weiterentwickelt von <a href="https://www.schultes.dev">Gregor Schulte</a> 2021-2023</div>
 		</div>
 	</div>
 	<script type="text/javascript">var errorHandler = '<?php echo $data['errorHandler']; ?>';</script>
--- a/public_html/templates/ssh_login.tpl.php
+++ b/public_html/templates/ssh_login.tpl.php
@@ -5,50 +5,53 @@
 		<div class="inner-header">
 			<span><?php _e('SSH-Login'); ?></span>
 		</div>
-<?php if ($data['logged_in'] === false) { ?>
-		<form action="?s=ssh_login" method="post">
-			<div class="inner">
-				<strong class="red"><?php _e('Du bist noch nicht angemeldet. Dadurch kannst du einige Funktionen nicht nutzen.'); ?></strong>
-			</div>
-			<input type="radio" id="ssh-login-passwd" name="ssh-login" value="password" checked="checked" />
-			<label for="ssh-login-passwd">
-				<div class="inner-table">
-					<div class="ssh-login-table-clickable-area"></div>
-					<table class="table table-borderless">
-						<tr>
-							<th colspan="2"><strong><?php _e('Anmeldung &uuml;ber ein Passwort'); ?></strong><span> [<?php _e('Klicken zum aktivieren'); ?>]</span></th>
-						</tr>
-						<tr>
-							<td style="width: 30%;"><strong><?php _e('SSH-Port'); ?></strong></td>
-							<td><input type="text" name="port" style="width: 50px;" value="<?php echo $data['ssh_info']['port']; ?>" maxlength="5" /> <span class="small-info"><?php _e('Standard: %d', 22); ?></span></td>
-						</tr>
-						<tr>
-							<td><strong><?php _e('SSH-Benutzername'); ?></strong></td>
-							<td><input type="text" name="username" style="width: 40%;" value="<?php echo $data['ssh_info']['username']; ?>" /></td>
-						</tr>
-						<tr>
-							<td><strong><?php _e('SSH-Passwort'); ?></strong></td>
-							<td><input type="password" name="password" style="width: 40%;" /></td>
-						</tr>
-						<tr>
-							<td><strong><?php _e('SSH-Login speichern?'); ?></strong></td>
-							<td><input type="checkbox" name="remember-me" value="checked" id="ssh-login-passwd-checkbox" /><label for="ssh-login-passwd-checkbox" class="checkbox only-checkbox">&nbsp;</label> <span class="small_info"><?php _e('Speichert das Passwort, damit nicht nach jeder Session neu angemeldet werden muss.'); ?></span></td>
-						</tr>
-					</table>
+		<?php if ($data['logged_in'] === false) { ?>
+			<form action="?s=ssh_login" method="post">
+				<div class="inner">
+					<strong class="red"><?php _e('Du bist noch nicht angemeldet. Dadurch kannst du einige Funktionen nicht nutzen.'); ?></strong>
 				</div>
-			</label>
-			<div class="inner">
-				<div class="divider"><div></div><div><?php _e('ODER'); ?></div></div>
-			</div>
-			<input type="radio" id="ssh-login-pubkey" name="ssh-login" value="publickey" />
-			<label for="ssh-login-pubkey">
-				<div class="inner-table">
-					<div class="ssh-login-table-clickable-area"></div>
-					<table class="table table-borderless">
-						<tr>
-							<th colspan="2"><strong><?php _e('Anmeldung &uuml;ber einen Publickey'); ?></strong><span> [<?php _e('Klicken zum aktivieren'); ?>]</span></th>
-						</tr>
-						<tr>
+				<input type="radio" id="ssh-login-passwd" name="ssh-login" value="password" checked="checked" />
+				<label for="ssh-login-passwd">
+					<div class="inner-table">
+						<div class="ssh-login-table-clickable-area"></div>
+						<table class="table table-borderless">
+							<tr>
+								<th colspan="2"><strong><?php _e('Anmeldung &uuml;ber ein Passwort'); ?></strong><span> [<?php _e('Klicken zum aktivieren'); ?>]</span></th>
+							</tr>
+							<tr>
+								<td style="width: 30%;"><strong><?php _e('SSH-Port'); ?></strong></td>
+								<td><input type="text" name="port" style="width: 50px;" value="<?php echo $data['ssh_info']['port']; ?>" maxlength="5" /> <span class="small-info"><?php _e('Standard: %d', 22); ?></span></td>
+							</tr>
+							<tr>
+								<td><strong><?php _e('SSH-Benutzername'); ?></strong></td>
+								<td><input type="text" name="username" style="width: 40%;" value="<?php echo $data['ssh_info']['username']; ?>" /></td>
+							</tr>
+							<tr>
+								<td><strong><?php _e('SSH-Passwort'); ?></strong></td>
+								<td><input type="password" name="password" style="width: 40%;" /></td>
+							</tr>
+							<tr>
+								<td><strong><?php _e('SSH-Login speichern?'); ?></strong></td>
+								<td><input type="checkbox" name="remember-me" value="checked" id="ssh-login-passwd-checkbox" /><label for="ssh-login-passwd-checkbox" class="checkbox only-checkbox">&nbsp;</label> <span class="small_info"><?php _e('Speichert das Passwort, damit nicht nach jeder Session neu angemeldet werden muss.'); ?></span></td>
+							</tr>
+						</table>
+					</div>
+				</label>
+				<div class="inner">
+					<div class="divider">
+						<div></div>
+						<div><?php _e('ODER'); ?></div>
+					</div>
+				</div>
+				<input type="radio" id="ssh-login-pubkey" name="ssh-login" value="publickey" />
+				<label for="ssh-login-pubkey">
+					<div class="inner-table">
+						<div class="ssh-login-table-clickable-area"></div>
+						<table class="table table-borderless">
+							<tr>
+								<th colspan="2"><strong><?php _e('Anmeldung &uuml;ber einen Publickey'); ?></strong><span> [<?php _e('Klicken zum aktivieren'); ?>]</span></th>
+							</tr>
+							<tr>
 								<td style="width: 30%;"><strong><?php _e('SSH-Port'); ?></strong></td>
 								<td><input type="text" name="port_" style="width: 50px;" value="<?php echo $data['ssh_info']['port']; ?>" maxlength="5" /> <span class="small-info"><?php _e('Standard: 22'); ?></span></td>
 							</tr>
@@ -68,21 +71,21 @@
 								<td><strong><?php _e('SSH-Login speichern?'); ?></strong></td>
 								<td><input type="checkbox" name="remember-me_" value="checked" id="ssh-login-pubkey-checkbox" /><label for="ssh-login-pubkey-checkbox" class="checkbox only-checkbox">&nbsp;</label> <span class="small_info"><?php _e('Speichert das Passwort, damit nicht nach jeder Session neu angemeldet werden muss.'); ?></span></td>
 							</tr>
-					</table>
+						</table>
+					</div>
+				</label>
+				<div class="inner-end">
+					<input type="submit" name="submit" value="<?php _e('Anmelden'); ?>" />
 				</div>
-			</label>
-			<div class="inner-end">
-				<input type="submit" name="submit" value="<?php _e('Anmelden'); ?>" />
+			</form>
+		<?php } else { ?>
+			<div class="inner">
+				<strong class="green"><?php _e('Du bist bereits angemeldet mit dem Benutzer %s.', $data['ssh_info']['username']); ?></strong>
 			</div>
-		</form>
-<?php } else { ?>
-		<div class="inner">
-			<strong class="green"><?php _e('Du bist bereits angemeldet mit dem Benutzer %s.', $data['ssh_info']['username']); ?></strong>
-		</div>
-		<div class="inner-end">
-			<a href="?s=ssh_login&amp;logout"><button><?php _e('Abmelden'); ?></button></a>
-		</div>
-<?php } ?>
+			<div class="inner-end">
+				<a href="?s=ssh_login&amp;logout"><button><?php _e('Abmelden'); ?></button></a>
+			</div>
+		<?php } ?>
 	</div>
 </div>
 <div class="clear_both"></div>
--- a/public_html/templates/terminal.tpl.php
+++ b/public_html/templates/terminal.tpl.php
@@ -1,14 +1,26 @@
 <?php if (!defined('PICONTROL')) exit(); ?>
 <style>
-	.system_msg{color: #01a7db; font-style: italic;}
-	.user_name{font-weight:bold;}
-	.user_message{color: #FFFFFF;}
-	pre { margin: 0; }
+	.system_msg {
+		color: #01a7db;
+		font-style: italic;
+	}
+
+	.user_name {
+		font-weight: bold;
+	}
+
+	.user_message {
+		color: #FFFFFF;
+	}
+
+	pre {
+		margin: 0;
+	}
 </style>
 <script language="javascript" type="text/javascript">
-var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>';
-var port = <?php echo $data['port']; ?>;
-var cookie = '<?php echo $data['cookie']; ?>';
+	var ip = '<?php echo $_SERVER['SERVER_ADDR']; ?>';
+	var port = <?php echo $data['port']; ?>;
+	var cookie = '<?php echo $data['cookie']; ?>';
 </script>
 <script language="javascript" type="text/javascript" src="public_html/js/terminal.websocket.js"></script>
 <div class="sidebar">
@@ -19,9 +31,9 @@ var cookie = '<?php echo $data['cookie']; ?>';
 		<div class="inner">
 			<strong id="status"><?php _e('Lade...'); ?></strong><br /><br />
 			<select name="terminal">
-<?php foreach ($data['ports'] as $index => $port) { ?>
-				<option style="background: <?php echo ($port['active'] === true) ? '#73CA3C' : '#E9492E'; ?>;" value="<?php echo $port['port']; ?>"<?php if ($data['port'] == $port['port']) echo ' selected="selected"'; ?>><?php _e('Terminal %d (%s)', $index+1, ($port['active'] === true) ? _t('Online') : _t('Offline')); ?></option>
-<?php } ?>
+				<?php foreach ($data['ports'] as $index => $port) { ?>
+					<option style="background: <?php echo ($port['active'] === true) ? '#73CA3C' : '#E9492E'; ?>;" value="<?php echo $port['port']; ?>" <?php if ($data['port'] == $port['port']) echo ' selected="selected"'; ?>><?php _e('Terminal %d (%s)', $index + 1, ($port['active'] === true) ? _t('Online') : _t('Offline')); ?></option>
+				<?php } ?>
 			</select>
 			<div id="frame"></div>
 		</div>
--- a/resources/init.php
+++ b/resources/init.php
@@ -81,4 +81,3 @@ if (isset($_COOKIE['debug'], $_GET['s']) && $_COOKIE['debug'] == 'debug_mode')

 if (!isset($doNotCheckForAuthentification))
 	(include LIBRARY_PATH.'main/authentification.php') or die('Nicht gefunden!');
-?>
--- 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()
--- a/resources/library/main/tpl.class.php
+++ b/resources/library/main/tpl.class.php
@@ -827,8 +827,7 @@ class PiTpl
 		if ($this->tplSSH === NULL)
 			if (self::loadSSH() !== true) {
 				if ($cancelIfError !== 0)
-					self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, diese Funktion steht aktuell nicht zur Verfügung!'), ($cancelIfError === 1) ? true : false);
-				#self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);
+					self::error(_t('SSH-Zugriffsfehler'), _t('Kein SSH-Zugriff, bitte anmelden! <a href="%s">Jetzt anmelden.</a>', '?s=ssh_login'), ($cancelIfError === 1) ? true : false);

 				return false;
 			}
Author	SHA1	Message	Date
Gregor Schulte	db3d54a835	Umstellung auf GET Methoden Zusammenfassen von Anfragen	2023-10-27 23:05:48 +02:00
Gregor Schulte	37e155a9b1	Vorbereitungen SSH Login	2023-09-23 16:17:39 +02:00
Gregor Schulte	69e2ee972c	README.md aktualisiert	2023-08-18 21:26:56 +02:00