Cleanup

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

1 files changed, 177 insertions, 122 deletions

diff --git a/templates/settings-admin.php b/templates/settings-admin.php
index 0f46fd2..52b4b99 100644
--- a/templates/settings-admin.php
+++ b/templates/settings-admin.php
@@ -19,7 +19,6 @@
  *
  */
 
-
 script('serverinfo', 'script');
 script('serverinfo', 'smoothie');
 script('serverinfo', 'Chart.min');
@@ -27,99 +26,111 @@ script('serverinfo', 'Chart.min');
 style('serverinfo', 'style');
 
 function FormatBytes($byte) {
-	$unim = array('B','KB','MB','GB','TB','PB');
+	$unim  = array('B', 'KB', 'MB', 'GB', 'TB', 'PB');
 	$count = 1;
-	while ($byte>=1024) {
+	while ($byte >= 1024) {
 		$count++;
-		$byte = $byte/1024;
+		$byte = $byte / 1024;
 	}
-	return number_format($byte,2,'.','.').' '.$unim[$count];
+	return number_format($byte, 2, '.', '.') . ' ' . $unim[$count];
 }
 
 ?>
 
-<div class="section"><h2><?php echo('<img class="infoicon" src="'.image_path('serverinfo', 'server.svg').'">'); p($_['hostname']); ?></h2>
+<!-- SERVER INFOS -->
+<div class="section">
+	<h2>
+		<img class="infoicon" src="<?php p(image_path('serverinfo', 'server.svg'));?>">
+		<?php p($_['hostname']);?>
+	</h2>
 
 	<p>
-		<?php p($l->t('Operating System').': '); ?>
-		<span class="info"><?php p($_['osname']); ?></span>
-	</p><p>
-		<?php p($l->t('CPU').': '); ?>
-		<span class="info"><?php p($_['cpu']); ?></span>
-	</p><p>
-		<?php p($l->t('Memory').': '); ?>
-		<span class="info"><?php p($_['memory']); ?></span>
-	</p><p>
-		<?php p($l->t('Server time').': '); ?>
+		<?php p($l->t('Operating System'));?>:
+		<span class="info"><?php p($_['osname']);?></span>
+	</p>
+	<p>
+		<?php p($l->t('CPU'));?>:
+		<span class="info"><?php p($_['cpu']);?></span>
+	</p>
+	<p>
+		<?php p($l->t('Memory'));?>:
+		<span class="info"><?php p($_['memory']);?></span>
+	</p>
+	<p>
+		<?php p($l->t('Server time'));?>:
 		<span class="info" id="servertime"></span>
-	</p><p>
-		<?php p($l->t('Uptime').': '); ?>
+	</p>
+	<p>
+		<?php p($l->t('Uptime'));?>:
 		<span class="info" id="uptime"></span>
-	</p><p>
-		<?php p($l->t('Time Servers').': '); ?>
+	</p>
+	<p>
+		<?php p($l->t('Time Servers'));?>:
 		<span class="info" id="timeservers"></span>
 	</p>
 
-
-
 	<div class="wrapper">
-	    <div id="one">
 
+		<div id="one">
 			<div class="infobox" id="cpuSection">
 				<h2><?php p($l->t('Load'));?></h2>
 				<canvas id="cpuloadcanvas" width="100" height="150"></canvas>
 			</div>
 			<p><em id="cpuFooterInfo"></em></p>
-
 		</div>
-		<div id="two">
 
+		<div id="two">
 			<div class="infobox">
 			<h2><?php p($l->t('Memory'));?></h2>
 			<canvas id="memorycanvas" width="300" height="150"></canvas>
 			</div>
 			<p><span class="rambox" id="rambox">&nbsp;&nbsp;</span>&nbsp;&nbsp;<em id="memFooterInfo"></em></p>
 			<p><span class="swapbox" id="swapbox">&nbsp;&nbsp;</span>&nbsp;&nbsp;<em id="swapFooterInfo"></em></p>
-
-
 		</div>
+
 	</div>
+</div>
 
+<!-- DISK STATUS -->
+<div class="section">
+	<h2>
+		<img class="infoicon" src="<?php p(image_path('serverinfo', 'hdd-o.svg'));?>">
+		<?php p($l->t('Disk'));?>
+	</h2>
+	<p>
+		<?php foreach ($_['diskinfo'] as $disk) {?>
 
+			<div class="infobox">
+				<div class="diskchart-container">
+					<canvas id="DiskChart" class="DiskChart" width="50" height="50"></canvas>
+				</div>
+
+				<h3><?php p(basename($disk['device']));?></h3>
+				<p>
+					<?php p($l->t('Mount'));?> :
+					<span class="info"><?php p($disk['mount']);?></span>
+				</p>
+				<p>
+					<?php p($l->t('Filesystem'));?> :
+					<span class="info"><?php p($disk['fs']);?></span>
+				</p>
+				<p>
+					<?php p($l->t('Size'));?> :
+					<span class="info"><?php p(FormatBytes($disk['used'] + $disk['available']));?></span>
+				</p>
+				<p>
+					<?php p($l->t('Available'));?> :
+					<span class="info"><?php p(FormatBytes($disk['available']));?></span>
+				</p>
+				<p>
+					<?php p($l->t('Used'));?> :
+					<span class="info"><?php p($disk['percent']);?></span>
+				</p>
+			</div>
 
-</div>
+		<?php }?>
 
-<div class="section"><h2><?php echo('<img class="infoicon" src="'.image_path('serverinfo', 'hdd-o.svg').'">'); p($l->t('Disk')); ?></h2>
-	<p>
-		<?php
-		foreach ($_['diskinfo'] as $disk) {
-
-			echo('<div class="infobox">');
-
-			echo('<div class="diskchart-container">');
-			echo('<canvas id="DiskChart" class="DiskChart" width="50" height="50"></canvas>');
-			echo('</div>');
-
-			echo('<h3>'.basename($disk['device']).'</h3>');
-			echo('<p>');
-			p($l->t('Mount').': ');
-			echo('<span class="info">'.$disk['mount'].'</span>');
-			echo('</p><p>');
-			p($l->t('Filesystem').': ');
-			echo('<span class="info">'.$disk['fs'].'</span>');
-			echo('</p><p>');
-			p($l->t('Size').': ');
-			echo('<span class="info">'.FormatBytes($disk['used']+$disk['available']).'</span>');
-			echo('</p><p>');
-			p($l->t('Available').': ');
-			echo('<span class="info">'.FormatBytes($disk['available']).'</span>');
-			echo('</p><p>');
-			p($l->t('Used').': ');
-			echo('<span class="info">'.$disk['percent'].'</span>');
-			echo('</p></div>');
-		}
-		?>
-		<div class="smallinfo"> <?php p($l->t('You will get a notification once one of your disks is nearly full.')); ?></div>
+		<div class="smallinfo"> <?php p($l->t('You will get a notification once one of your disks is nearly full.'));?></div>
 
 		<p><?php p($l->t('Files:'));?> <em id="numFilesStorage"><?php p($_['storage']['num_files']);?></em></p>
 		<p><?php p($l->t('Storages:'));?> <em id="numFilesStorages"><?php p($_['storage']['num_storages']);?></em></p>
@@ -127,98 +138,142 @@ function FormatBytes($byte) {
 	</p>
 </div>
 
-<div class="section"><h2><?php echo('<img class="infoicon" src="'.image_path('serverinfo', 'sort.svg').'">'); p($l->t('Network')); ?></h2>
+<!-- NETWORK -->
+<div class="section">
+	<h2>
+		<img class="infoicon" src="<?php p(image_path('serverinfo', 'sort.svg'));?>">
+		<?php p($l->t('Network'));?>
+	</h2>
 	<p>
-
 		<p>
-			<?php p($l->t('Hostname').': '); ?>
-			<span class="info"><?php p($_['networkinfo']['hostname']); ?></span>
-		</p><p>
-			<?php p($l->t('DNS').': '); ?>
-			<span class="info"><?php p($_['networkinfo']['dns']); ?></span>
-		</p><p>
-			<?php p($l->t('Gateway').': '); ?>
-			<span class="info"><?php p($_['networkinfo']['gateway']); ?></span>
-		</p><p>
+			<?php p($l->t('Hostname'));?>:
+			<span class="info"><?php p($_['networkinfo']['hostname']);?></span>
+		</p>
+		<p>
+			<?php p($l->t('DNS'));?>:
+			<span class="info"><?php p($_['networkinfo']['dns']);?></span>
+		</p>
+		<p>
+			<?php p($l->t('Gateway'));?>:
+			<span class="info"><?php p($_['networkinfo']['gateway']);?></span>
+		</p>
+		<p>
+		<?php foreach ($_['networkinterfaces'] as $interface) {?>
 
+			<div class="infobox">
+				<h3><?php p($interface['interface'])?></h3>
+				<p>
+					<?php p($l->t('Status'));?>:
+					<span class="info"><?php p($interface['status'])?></span>
+				</p>
+				<p>
+					<?php p($l->t('Speed'));?>:
+					<span class="info"><?php p($interface['speed'] . ' ' . $interface['duplex'])?></span>
+				</p>
+				<?php if (!empty($interface['mac'])) {?>
+					<p>
+						<?php p($l->t('MAC'));?>:
+						<span class="info"><?php p($interface['mac'])?></span>
+					</p>
+				<?php }?>
+				<p>
+					<?php p($l->t('IPv4'));?>:
+					<span class="info"><?php p($interface['ipv4'])?></span>
+				</p>
+				<p>
+					<?php p($l->t('IPv6'));?>:
+					<span class="info"><?php p($interface['ipv6'])?></span>
+				</p>
+			</div>
 
-<?php
+		<?php }?>
 
-		foreach ($_['networkinterfaces'] as $interface) {
-				echo('<div class="infobox">');
-				echo('<h3>'.$interface['interface'].'</h3>');
-				echo('<p>');
-				p($l->t('Status').': ');
-				echo('<span class="info">'.$interface['status'].'</span>');
-				echo('</p><p>');
-				p($l->t('Speed').': ');
-				echo('<span class="info">'.$interface['speed'].' '.$interface['duplex'].'</span>');
-				echo('</p><p>');
-
-				if(!empty($interface['mac'])) {
-					p($l->t('MAC').': ');
-					echo('<span class="info">'.$interface['mac'].'</span>');
-					echo('</p><p>');
-				}
-				p($l->t('IPv4').': ');
-				echo('<span class="info">'.$interface['ipv4'].'</span>');
-				echo('</p><p>');
-				p($l->t('IPv6').': ');
-				echo('<span class="info">'.$interface['ipv6'].'</span>');
-				echo('</p></div>');
-		}
-
-		?>
 	</p>
 </div>
 
-
+<!-- ACTIVE USERS -->
 <div class="section" id="activeUsersSection">
 	<div class="infobox">
-	<h2><?php p($l->t('Active users'));?></h2>
-	<br>
-	<div class="chart-container">'
-	<canvas width="400" height="250" data-users="<?php p(json_encode($_['activeUsers'])) ?>" class="barchart" id="activeuserscanvas"></canvas>
+		<h2><?php p($l->t('Active users'));?></h2>
+		<br>
+		<div class="chart-container">
+			<canvas width="400" height="250" data-users="<?php p(json_encode($_['activeUsers']))?>" class="barchart" id="activeuserscanvas"></canvas>
+		</div>
+		<p>
+			<?php p($l->t('Total users:'));?>
+			<em id="numUsersStorage"><?php p($_['storage']['num_users']);?></em>
+		</p>
 	</div>
-	<p><?php p($l->t('Total users:'));?> <em id="numUsersStorage"><?php p($_['storage']['num_users']);?></em></p>
-</div>
 </div>
+
+<!-- SHARES -->
 <div class="section" id="sharesSection">
-<div class="infobox">
-	<h2><?php p($l->t('Shares'));?></h2>
-	<br>
-	<div class="chart-container">'
-	<canvas data-shares="<?php p(json_encode($_['shares'])) ?>" class="barchart" id="sharecanvas"></canvas>
-</div>
-</div>
+	<div class="infobox">
+		<h2><?php p($l->t('Shares'));?></h2>
+		<br>
+		<div class="chart-container">
+			<canvas data-shares="<?php p(json_encode($_['shares']))?>" class="barchart" id="sharecanvas"></canvas>
+		</div>
+	</div>
 </div>
 
-
-<div class="section" id="phpSection"><h2><?php echo('<img class="infoicon" src="'.image_path('serverinfo', 'hdd-o.svg').'">'); p($l->t('PHP')); ?></h2>
+<!-- PHPINFO -->
+<div class="section" id="phpSection">
+	<h2>
+		<img class="infoicon" src="<?php p(image_path('serverinfo', 'hdd-o.svg'));?>">
+		<?php p($l->t('PHP'));?>
+	</h2>
 	<div class="infobox">
-	<p><?php p($l->t('Version:'));?> <em id="phpVersion"><?php p($_['php']['version']);?></em></p>
-	<p><?php p($l->t('Memory Limit:'));?> <em id="phpMemLimit"><?php p($_['php']['memory_limit']);?></em></p>
-	<p><?php p($l->t('Max Execution Time:'));?> <em id="phpMaxExecTime"><?php p($_['php']['max_execution_time']);?></em></p>
-	<p><?php p($l->t('Upload max size:'));?> <em id="phpUploadMaxSize"><?php p($_['php']['upload_max_filesize']);?></em></p>
+		<p>
+			<?php p($l->t('Version:'));?>
+			<em id="phpVersion"><?php p($_['php']['version']);?></em>
+		</p>
+		<p>
+			<?php p($l->t('Memory Limit:'));?>
+			<em id="phpMemLimit"><?php p($_['php']['memory_limit']);?></em>
+		</p>
+		<p>
+			<?php p($l->t('Max Execution Time:'));?>
+			<em id="phpMaxExecTime"><?php p($_['php']['max_execution_time']);?></em>
+		</p>
+		<p>
+			<?php p($l->t('Upload max size:'));?>
+			<em id="phpUploadMaxSize"><?php p($_['php']['upload_max_filesize']);?></em>
+		</p>
 	</div>
 </div>
 
-<div class="section" id="databaseSection"><h2><?php echo('<img class="infoicon" src="'.image_path('serverinfo', 'hdd-o.svg').'">'); p($l->t('Database')); ?></h2>
+<!-- DATABASE -->
+<div class="section" id="databaseSection">
+	<h2>
+		<img class="infoicon" src="<?php p(image_path('serverinfo', 'hdd-o.svg'));?>">
+		<?php p($l->t('Database'));?>
+	</h2>
 	<div class="infobox">
-	<p><?php p($l->t('Type:'));?> <em id="databaseType"><?php p($_['database']['type']);?></em></p>
-	<p><?php p($l->t('Version:'));?> <em id="databaseVersion"><?php p($_['database']['version']);?></em></p>
-	<p><?php p($l->t('Size:'));?> <em id="databaseSize"><?php p($_['database']['size']);?></em></p>
+		<p>
+			<?php p($l->t('Type:'));?>
+			<em id="databaseType"><?php p($_['database']['type']);?></em>
+		</p>
+		<p>
+			<?php p($l->t('Version:'));?>
+			<em id="databaseVersion"><?php p($_['database']['version']);?></em>
+		</p>
+		<p>
+			<?php p($l->t('Size:'));?>
+			<em id="databaseSize"><?php p($_['database']['size']);?></em>
+		</p>
 	</div>
 </div>
 
+<!-- OCS ENDPOINT -->
 <div class="section" id="ocsEndPoint">
 	<h2><?php p($l->t('External monitoring tool'));?></h2>
 	<p>
-		<?php p($l->t('You can connect an external monitoring tool by using this end point:')); ?>
+		<?php p($l->t('You can connect an external monitoring tool by using this end point:'));?>
 	</p>
 	<div>
 		<input type="text" readonly="readonly" id="monitoring-endpoint-url" value="<?php echo p($_['ocs']); ?>" />
 		<a class="clipboardButton icon icon-clippy" data-clipboard-target="#monitoring-endpoint-url"></a>
-		<span class="icon-info svg" title="" data-original-title="<?php p($l->t('Did you know?')); ?> <?php p($l->t('Appending "?format=json" at the end of the URL gives you the result in JSON format!')); ?>"></span>
+		<span class="icon-info svg" title="" data-original-title="<?php p($l->t('Did you know?'));?> <?php p($l->t('Appending "?format=json" at the end of the URL gives you the result in JSON format!'));?>"></span>
 	</div>
 </div>