Tidy up the EOL page and move interval formatting to an include file.

php · Oct 27, 2014 · 06658b4 · 06658b4
1 parent 7b010a9
commit 06658b4
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 37 deletions.
diff --git a/eol.php b/eol.php
@@ -38,41 +38,9 @@
 		</tr>
 	</thead>
 	<tbody>
-		<?php foreach (get_eol_branches() as $major => $branches):
-
-				foreach ($branches as $branch => $detail) {
-					try {
-						$now  = new DateTime;
-						$then = new DateTime('@'.$detail['date']);
-						$diff = $now->diff($then);
-						$times = array();
-						if ($diff->y) {
-							$times[] = array($diff->y,'year');
-							if ($diff->m) {
-    							$times[] = array($diff->m,'month');
-							}
-						} elseif ($diff->m) {
-							$times[] = array($diff->m,'month');
-						} elseif ($diff->d) {
-							$times[] = array($diff->d,'day');
-						} else {
-							$eolPeriod = 'moments ago...';
-						}
-						if ($times) {
-							$eolPeriod = implode(', ', 
-														array_map(
-															function($t) {
-																return "$t[0] $t[1]" .
-																		($t[0] != 1 ? 's' : '');
-															},
-															$times
-														)
-												) . " ago";
-						}
-					} catch(Exception $e) {
-						$eolPeriod = 'unknown...';
-					}
-		?>
+		<?php foreach (get_eol_branches() as $major => $branches): ?>
+			<?php foreach ($branches as $branch => $detail): ?>
+				<?php $eolPeriod = format_interval('@'.$detail['date'], null) ?>
 					<tr>
 						<td><?php echo htmlspecialchars($branch); ?></td>
 						<td>
@@ -90,8 +58,8 @@ function($t) {
 							<?php echo isset($BRANCH_NOTES[$branch]) ? $BRANCH_NOTES[$branch] : ''; ?>
 					</td>
 				</tr>
-			    <?php } ?>
-		<?php endforeach; ?>
+			<?php endforeach ?>
+		<?php endforeach ?>
 	</tbody>
 </table>
 

diff --git a/include/branches.inc b/include/branches.inc
@@ -2,6 +2,49 @@
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/releases.inc';
 include_once $_SERVER['DOCUMENT_ROOT'] . '/include/version.inc';
 
+function format_interval($from, $to) {
+	try {
+		$from_obj = $from instanceof DateTime ? $from : new DateTime($from);
+		$to_obj = $to instanceof DateTime ? $to : new DateTime($to);
+		$diff = $to_obj->diff($from_obj);
+
+		$times = array();
+		if ($diff->y) {
+			$times[] = array($diff->y,'year');
+			if ($diff->m) {
+					$times[] = array($diff->m,'month');
+			}
+		} elseif ($diff->m) {
+			$times[] = array($diff->m,'month');
+		} elseif ($diff->d) {
+			$times[] = array($diff->d,'day');
+		} else {
+			$eolPeriod = 'today';
+		}
+		if ($times) {
+			$eolPeriod = implode(', ', 
+										array_map(
+											function($t) {
+												return "$t[0] $t[1]" .
+														($t[0] != 1 ? 's' : '');
+											},
+											$times
+										)
+								);
+
+			if ($diff->invert) {
+				$eolPeriod = "$eolPeriod ago";
+			} else {
+				$eolPeriod = "in $eolPeriod";
+			}
+		}
+	} catch(Exception $e) {
+		$eolPeriod = 'unknown';
+	}
+
+	return $eolPeriod;
+}
+
 function version_number_to_branch($version) {
 	$parts = explode('.', $version);
 	if (count($parts) > 1) {