From 94e0df976f91d9f5e413785873ea18049c17864b Mon Sep 17 00:00:00 2001
From: cytopia <cytopia@everythingcli.org>
Date: Sat, 22 Oct 2016 17:38:21 +0200
Subject: [PATCH] Layout improvements

---
 .devilbox/www/config.php                   |  4 +-
 .devilbox/www/htdocs/_ajax_db.php          |  1 +
 .devilbox/www/htdocs/assets/css/custom.css | 10 +++-
 .devilbox/www/htdocs/credits.php           | 55 ++++++++++++++++++++++
 .devilbox/www/htdocs/databases.php         | 12 ++---
 .devilbox/www/htdocs/index.php             |  8 ++--
 .devilbox/www/htdocs/mysqlinfo.php         | 11 +----
 .devilbox/www/htdocs/phpinfo.php           |  7 ---
 .devilbox/www/htdocs/vhosts.php            |  2 +-
 .devilbox/www/include/footer.php           | 10 ++--
 10 files changed, 86 insertions(+), 34 deletions(-)
 create mode 100644 .devilbox/www/htdocs/credits.php
diff --git a/.devilbox/www/config.php b/.devilbox/www/config.php
index eac981cf..55ea4875 100644
--- a/.devilbox/www/config.php
+++ b/.devilbox/www/config.php
@@ -33,4 +33,6 @@ $MY_MYSQL_LINK		= NULL;
 
 require $MY_DIR . DIRECTORY_SEPARATOR . 'include' . DIRECTORY_SEPARATOR .'functions.php';
 
-$MY_MYSQL_LINK = my_mysql_connect($MY_MYSQL_ERR);
\ No newline at end of file
+if (isset($CONNECT) && $CONNECT) {
+	$MY_MYSQL_LINK = my_mysql_connect($MY_MYSQL_ERR);
+}
\ No newline at end of file
diff --git a/.devilbox/www/htdocs/_ajax_db.php b/.devilbox/www/htdocs/_ajax_db.php
index ec7e67cf..caf1483b 100644
--- a/.devilbox/www/htdocs/_ajax_db.php
+++ b/.devilbox/www/htdocs/_ajax_db.php
@@ -1,4 +1,5 @@
 <?php
+$CONNECT = TRUE;
 require '../config.php';
 
 if (isset($_GET['size'])) {
diff --git a/.devilbox/www/htdocs/assets/css/custom.css b/.devilbox/www/htdocs/assets/css/custom.css
index 2dee2a00..47dc1533 100644
--- a/.devilbox/www/htdocs/assets/css/custom.css
+++ b/.devilbox/www/htdocs/assets/css/custom.css
@@ -1,5 +1,9 @@
-/* Fix tables
+/* Bootstrap overwrites
 -------------------------------------------------- */
+html, body {
+    font-size: 14px;
+}
+
 td {
 	word-break: break-all;
 }
@@ -98,4 +102,6 @@ nav.navbar {
     line-height: 1.5;
     color: #373a3c;
     background-color: #fff;
-}
\ No newline at end of file
+}
+
+
diff --git a/.devilbox/www/htdocs/credits.php b/.devilbox/www/htdocs/credits.php
new file mode 100644
index 00000000..5e5c4eaa
--- /dev/null
+++ b/.devilbox/www/htdocs/credits.php
@@ -0,0 +1,55 @@
+<?php require '../config.php'; ?>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+		<?php require '../include/head.php'; ?>
+	</head>
+
+	<body>
+		<?php require '../include/navigation.php'; ?>
+
+		<div class="container">
+
+			<h1>Credits</h1>
+
+			<div class="row">
+				<div class="col-md-12">
+
+					<table class="table table-striped ">
+						<thead class="thead-inverse ">
+							<tr>
+								<th>Vendor</th>
+								<th>License</th>
+								<th>Url</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>Bootstrap</td>
+								<td>MIT</td>
+								<td><a href="https://github.com/twbs/bootstrap">https://github.com/twbs/bootstrap</a></td>
+							</tr>
+							<tr>
+								<td>Opcache GUI</td>
+								<td>MIT</td>
+								<td><a href="https://github.com/amnuts/opcache-gui">https://github.com/amnuts/opcache-gui</a></td>
+							</tr>
+							<tr>
+								<td>phpMyAdmin</td>
+								<td>GPL 2.0</td>
+								<td><a href="https://github.com/phpmyadmin/phpmyadmin">https://github.com/phpmyadmin/phpmyadmin</a></td>
+							</tr>
+						</tbody>
+					</table>
+
+				</div>
+			</div>
+
+
+
+
+		</div><!-- /.container -->
+
+		<?php require '../include/footer.php'; ?>
+	</body>
+</html>
diff --git a/.devilbox/www/htdocs/databases.php b/.devilbox/www/htdocs/databases.php
index 4f236e4f..018b3ea5 100644
--- a/.devilbox/www/htdocs/databases.php
+++ b/.devilbox/www/htdocs/databases.php
@@ -1,4 +1,4 @@
-<?php require '../config.php'; ?>
+<?php $CONNECT = TRUE; require '../config.php'; ?>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -14,11 +14,9 @@
 
 			<div class="row">
 				<div class="col-md-12">
-					<?php
-						$databases = getDatabases();
-					?>
-					<table class="table table-striped">
-						<thead class="thead-inverse">
+
+					<table class="table table-striped ">
+						<thead class="thead-inverse ">
 							<tr>
 								<th>Name</th>
 								<th>Charset</th>
@@ -28,7 +26,7 @@
 							</th>
 						</thead>
 						<tbody>
-							<?php foreach ($databases as $name => $keys): ?>
+							<?php foreach (getDatabases() as $name => $keys): ?>
 								<tr>
 									<td><?php echo $name;?></td>
 									<td><?php echo $keys['charset'];?></td>
diff --git a/.devilbox/www/htdocs/index.php b/.devilbox/www/htdocs/index.php
index 3dfbffba..c6788f92 100644
--- a/.devilbox/www/htdocs/index.php
+++ b/.devilbox/www/htdocs/index.php
@@ -1,4 +1,4 @@
-<?php require '../config.php'; ?>
+<?php $CONNECT = TRUE; require '../config.php'; ?>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -39,7 +39,7 @@
 							<div class="bg-danger">
 								<div>
 									<div>
-										<?php echo getHttpVersion();?>
+										<h3><?php echo getHttpVersion();?></h3>
 									</div>
 								</div>
 							</div>
@@ -56,7 +56,7 @@
 							<div class="bg-info">
 								<div>
 									<div>
-										<?php echo getPHPVersion(); ?>
+										<h3><?php echo getPHPVersion(); ?></h3>
 									</div>
 								</div>
 							</div>
@@ -73,7 +73,7 @@
 							<div class="bg-warning">
 								<div>
 									<div>
-										<?php echo getMySQLVersion();?>
+										<h3><?php echo getMySQLVersion();?></h3>
 									</div>
 								</div>
 							</div>
diff --git a/.devilbox/www/htdocs/mysqlinfo.php b/.devilbox/www/htdocs/mysqlinfo.php
index ddbbed61..65048fad 100644
--- a/.devilbox/www/htdocs/mysqlinfo.php
+++ b/.devilbox/www/htdocs/mysqlinfo.php
@@ -1,4 +1,4 @@
-<?php require '../config.php'; ?>
+<?php $CONNECT = TRUE; require '../config.php'; ?>
 <!DOCTYPE html>
 <html lang="en">
 	<head>
@@ -22,7 +22,7 @@
 						<li><a target="_blank" href="https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html">https://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html</a></li>
 					</ul>
 
-					<table class="table table-striped table-sm">
+					<table class="table table-striped">
 						<thead class="thead-inverse">
 							<tr>
 								<th>Variable</th>
@@ -45,12 +45,5 @@
 		</div><!-- /.container -->
 
 		<?php require '../include/footer.php'; ?>
-		<script>
-		// self executing function here
-		(function() {
-			// your page initialization code here
-			// the DOM will be available here
-		})();
-		</script>
 	</body>
 </html>
diff --git a/.devilbox/www/htdocs/phpinfo.php b/.devilbox/www/htdocs/phpinfo.php
index bc4f72fc..9250a89b 100644
--- a/.devilbox/www/htdocs/phpinfo.php
+++ b/.devilbox/www/htdocs/phpinfo.php
@@ -18,12 +18,5 @@
 		</div><!-- /.container -->
 
 		<?php require '../include/footer.php'; ?>
-		<script>
-		// self executing function here
-		(function() {
-			// your page initialization code here
-			// the DOM will be available here
-		})();
-		</script>
 	</body>
 </html>
diff --git a/.devilbox/www/htdocs/vhosts.php b/.devilbox/www/htdocs/vhosts.php
index 7d0001a5..84708267 100644
--- a/.devilbox/www/htdocs/vhosts.php
+++ b/.devilbox/www/htdocs/vhosts.php
@@ -16,7 +16,7 @@
 				<div class="col-md-12">
 					<?php $vHosts = getVirtualHosts(); ?>
 					<?php if ($vHosts): ?>
-						<table class="table table-striped table-sm">
+						<table class="table table-striped">
 							<thead class="thead-inverse">
 								<tr>
 									<th>Project</th>
diff --git a/.devilbox/www/include/footer.php b/.devilbox/www/include/footer.php
index 107ff5c2..437eb9cf 100644
--- a/.devilbox/www/include/footer.php
+++ b/.devilbox/www/include/footer.php
@@ -1,9 +1,13 @@
 <nav class="navbar navbar-full footer navbar-dark bg-inverse">
 	<div class="container">
-		<p class="text-muted">Render time: <?php echo round((microtime(true) - $TIME_START), 2); ?> sec</p>
+		<ul class="nav navbar-nav">
+		<li class="nav-item nav-link">Render time: <?php echo round((microtime(true) - $TIME_START), 2); ?> sec</li>
+		<li class="nav-item float-xs-right"><a class="nav-link" href="/credits.php"><code>Credits</code></a></li>
+		<li class="nav-item float-xs-right"><a class="nav-link" href="https://github.com/cytopia/devilbox"><code>Github</code></a></li>
 	</div>
 </nav>
-<?php my_mysqli_close($GLOBALS['MY_MYSQL_LINK']); ?>
+
+<?php if ($GLOBALS['MY_MYSQL_LINK']) { my_mysqli_close($GLOBALS['MY_MYSQL_LINK']); } ?>
 
 <?php /*
 <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
@@ -11,4 +15,4 @@
 <!-- Include all compiled plugins (below), or include individual files as needed -->
 <script src="/vendor/bootstrap/bootstrap.min.js"></script>
 */
-?>
+

Vendor	License	Url
Bootstrap	MIT	https://github.com/twbs/bootstrap
Opcache GUI	MIT	https://github.com/amnuts/opcache-gui
phpMyAdmin	GPL 2.0	https://github.com/phpmyadmin/phpmyadmin