From 539df6b502d0ada19b3e972f552457684cb654ba Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 26 Nov 2009 12:42:19 -0500
Subject: [PATCH] - a few if()s less
---
program/include/main.inc | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/program/include/main.inc b/program/include/main.inc
index 89ae1b9..ae34a80 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -906,13 +906,15 @@
$today_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday'], $now_date['year']);
$week_limit = mktime(0, 0, 0, $now_date['mon'], $now_date['mday']-6, $now_date['year']);
- // define date format depending on current time
- if ($CONFIG['prettydate'] && !$format && $timestamp > $today_limit && $timestamp < $now)
- return sprintf('%s %s', rcube_label('today'), date($CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i', $timestamp));
- else if ($CONFIG['prettydate'] && !$format && $timestamp > $week_limit && $timestamp < $now)
- $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
- else if (!$format)
- $format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';
+ // define date format depending on current time
+ if (!$format) {
+ if ($CONFIG['prettydate'] && $timestamp > $today_limit && $timestamp < $now)
+ return sprintf('%s %s', rcube_label('today'), date($CONFIG['date_today'] ? $CONFIG['date_today'] : 'H:i', $timestamp));
+ else if ($CONFIG['prettydate'] && $timestamp > $week_limit && $timestamp < $now)
+ $format = $CONFIG['date_short'] ? $CONFIG['date_short'] : 'D H:i';
+ else
+ $format = $CONFIG['date_long'] ? $CONFIG['date_long'] : 'd.m.Y H:i';
+ }
// strftime() format
if (preg_match('/%[a-z]+/i', $format))
--
Gitblit v1.9.1