--- projects/cms/source/reports/php/latest/latest.php 2005/03/30 19:31:06 1.48 +++ projects/cms/source/reports/php/latest/latest.php 2005/05/04 14:14:25 1.49 @@ -110,16 +110,37 @@ function b2Mb($bytes) { function uptime($until) { $day = date('z', $until); $hour = date('G', $until); - $hour = $hour - 1; # one too many + if ($hour == 0) { # everything's an hour ahead, so roll back + $hour = 23; + $day = $day - 1; + } else { + $hour = $hour - 1; + } $minute = date('i', $until); $return = ""; if ($day) { - $return = "$return$day Days "; + $return = "$return$day"; + if ($day == 1) { + $return = "$return Day "; + } else { + $return = "$return Days "; + } } if ($hour) { - $return = "$return$hour Hours "; + $return = "$return$hour"; + if ($hour == 1) { + $return = "$return Hour "; + } else { + $return = "$return Hours "; + } } - return "$return$minute Mins"; + $return = "$return$minute"; + if ($minute == 1) { + $return = "$return Min"; + } else { + $return = "$return Mins"; + } + return $return; }