(legacy) more cleanups

src/www/includes/functions.inc.php

@@ -94,14 +94,23 @@ function get_uptime() {
 	else if ($updays > 0)
 		$uptimestr .= "1 Day ";
 
-	if ($uphours > 1)
+	if ($uphours > 1) {
 		$hours = "s";
+	} else {
+		$hours = "";
+	}
 
-	if ($upmins > 1)
+	if ($upmins > 1) {
 		$minutes = "s";
+	} else {
+		$minutes = "" ;
+	}
 
-	if ($upmins > 1)
+	if ($upmins > 1) {
 		$seconds = "s";
+	} else {
+		$seconds = "";
+	}
 
 	$uptimestr .= sprintf("%02d Hour$hours %02d Minute$minutes %02d Second$seconds", $uphours, $upmins, $upsecs);
 	return $uptimestr;

src/www/index.php

@@ -36,7 +36,6 @@ ob_start(null, "1000");
 
 
 ## Load Essential Includes
-require_once('functions.inc');
 require_once('guiconfig.inc');
 require_once('notices.inc');
 
@@ -92,9 +91,6 @@ if ($_POST && $_POST['sequence']) {
     exit;
 }
 
-## Load Functions Files
-require_once('includes/functions.inc.php');
-
 ## Check to see if we have a swap space,
 ## if true, display, if false, hide it ...
 if (file_exists('/usr/sbin/swapinfo')) {