diff options
Diffstat (limited to 'zarb-ml/mageia-sysadm/2011-January/002181.html')
| -rw-r--r-- | zarb-ml/mageia-sysadm/2011-January/002181.html | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/zarb-ml/mageia-sysadm/2011-January/002181.html b/zarb-ml/mageia-sysadm/2011-January/002181.html new file mode 100644 index 000000000..44fa911e1 --- /dev/null +++ b/zarb-ml/mageia-sysadm/2011-January/002181.html @@ -0,0 +1,136 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-sysadm] [314] Better split of key2date + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B314%5D%20Better%20split%20of%20key2date&In-Reply-To=%3C20110118125414.DDD63428D5%40valstar.mageia.org%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="002180.html"> + <LINK REL="Next" HREF="002182.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-sysadm] [314] Better split of key2date</H1> + <B>root at mageia.org</B> + <A HREF="mailto:mageia-sysadm%40mageia.org?Subject=Re%3A%20%5BMageia-sysadm%5D%20%5B314%5D%20Better%20split%20of%20key2date&In-Reply-To=%3C20110118125414.DDD63428D5%40valstar.mageia.org%3E" + TITLE="[Mageia-sysadm] [314] Better split of key2date">root at mageia.org + </A><BR> + <I>Tue Jan 18 13:54:14 CET 2011</I> + <P><UL> + <LI>Previous message: <A HREF="002180.html">[Mageia-sysadm] [313] Fixes +</A></li> + <LI>Next message: <A HREF="002182.html">[Mageia-sysadm] [315] Fix param name +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#2181">[ date ]</a> + <a href="thread.html#2181">[ thread ]</a> + <a href="subject.html#2181">[ subject ]</a> + <a href="author.html#2181">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>Revision: 314 +Author: pterjan +Date: 2011-01-18 13:54:14 +0100 (Tue, 18 Jan 2011) +Log Message: +----------- +Better split of key2date + +Modified Paths: +-------------- + build_system/web/index.php + +Modified: build_system/web/index.php +=================================================================== +--- build_system/web/index.php 2011-01-18 12:43:53 UTC (rev 313) ++++ build_system/web/index.php 2011-01-18 12:54:14 UTC (rev 314) +@@ -149,26 +149,19 @@ + return $date->getTimestamp(); + } + +-function key2date($key, $diff = null) { ++function timediff($key, $end) { + /** +- * Return human-readable time difference: +- * - against $key (YmdHis expected format) +- * - using only $diff (takes precedence over $key if provided) ++ * Return human-readable time difference + * +- * @param string $key past date to diff against from now +- * @param integer $diff time difference in seconds ++ * @param integer $start timestamp ++ * @param integer $end timestamp, defaults to now + * + * @return string + */ +- global $tz; +- +- if (is_null($diff) || $diff <= 0) { +- $t = key2timestamp($key); +- if (is_null($t)) +- return null; +- +- $diff = time() - $t; ++ if (is_null($end)) { ++ $end = time(); + } ++ $diff = $end - $start; + if ($diff<60) + return $diff . " second" . plural($diff); + $diff = round($diff/60); +@@ -292,7 +285,7 @@ + + $s .= sprintf($tmpl, + $p['type'], +- key2date($key) . ' ago', ++ timediff(key2timestamp($key)) . ' ago', + $p['user'], $p['user'], + $p['package'], + $p['version'], +@@ -313,7 +306,7 @@ + + $s .= '</td><td>'; + if ($p['type'] == 'uploaded') +- $s .= key2date(null, $p['buildtime']['diff']); ++ $s .= timediff($p['buildtime']['start'], $p['buildtime']['end']); + $s .= '</td>'; + //$s .= '<td>' . sprintf($badges[$p['type']], $p['user']) . '</td>'; + $s .= '</tr>'; +-------------- next part -------------- +An HTML attachment was scrubbed... +URL: </pipermail/mageia-sysadm/attachments/20110118/7d427c6a/attachment.html> +</PRE> + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="002180.html">[Mageia-sysadm] [313] Fixes +</A></li> + <LI>Next message: <A HREF="002182.html">[Mageia-sysadm] [315] Fix param name +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#2181">[ date ]</a> + <a href="thread.html#2181">[ thread ]</a> + <a href="subject.html#2181">[ subject ]</a> + <a href="author.html#2181">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-sysadm">More information about the Mageia-sysadm +mailing list</a><br> +</body></html> |