summaryrefslogtreecommitdiff
path: root/program/include
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2005-09-28 22:28:05 +0000
committerthomascube <thomas@roundcube.net>2005-09-28 22:28:05 +0000
commit30233b8dfb7fe5070dfa11b3e6d2015fb50aa769 (patch)
tree46cf5db699d97802e7c408c00a62e72dc22c640f /program/include
parent20a1b3a0e1a46266b149a23562bb71680e666edb (diff)
Minor bugfixes and correction of confusing License notfications
Diffstat (limited to 'program/include')
-rw-r--r--program/include/bugs.inc2
-rw-r--r--program/include/cache.inc2
-rw-r--r--program/include/main.inc8
-rw-r--r--program/include/rcube_imap.inc2
-rw-r--r--program/include/rcube_mysql.inc2
-rw-r--r--program/include/rcube_shared.inc2
-rw-r--r--program/include/session.inc2
7 files changed, 10 insertions, 10 deletions
diff --git a/program/include/bugs.inc b/program/include/bugs.inc
index 819887cc3..d67281ef3 100644
--- a/program/include/bugs.inc
+++ b/program/include/bugs.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the BQube Webmail client |
| Copyright (C) 2005, BQube Dev - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide error handling and logging functions |
diff --git a/program/include/cache.inc b/program/include/cache.inc
index 84ed8f07f..b1e6b9317 100644
--- a/program/include/cache.inc
+++ b/program/include/cache.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev, - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide access to the application cache |
diff --git a/program/include/main.inc b/program/include/main.inc
index 8cbc271b1..83421768a 100644
--- a/program/include/main.inc
+++ b/program/include/main.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev, - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide basic functions for the webmail package |
@@ -887,10 +887,10 @@ function format_date($date, $format=NULL)
$week_secs = 60 * 60 * 24 * 7;
$diff = $now - $timestamp;
- // define daate format depending on current time
- if (!$format && $diff < $day_secs)
+ // define date format depending on current time
+ if ($CONFIG['prettydate'] && !$format && $diff < $day_secs)
return sprintf('%s %s', rcube_label('today'), date('H:i', $timestamp));
- else if (!$format && $diff < $week_secs)
+ else if ($CONFIG['prettydate'] && !$format && $diff < $week_secs)
$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';
diff --git a/program/include/rcube_imap.inc b/program/include/rcube_imap.inc
index 594dbf40f..b5eba0094 100644
--- a/program/include/rcube_imap.inc
+++ b/program/include/rcube_imap.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| IMAP wrapper that implements the Iloha IMAP Library (IIL) |
diff --git a/program/include/rcube_mysql.inc b/program/include/rcube_mysql.inc
index bcffe5e2b..c5955489a 100644
--- a/program/include/rcube_mysql.inc
+++ b/program/include/rcube_mysql.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| MySQL wrapper class that implements PHP MySQL functions |
diff --git a/program/include/rcube_shared.inc b/program/include/rcube_shared.inc
index 2c0b0517b..21c3ae8b4 100644
--- a/program/include/rcube_shared.inc
+++ b/program/include/rcube_shared.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube PHP suite |
| Copyright (C) 2005, RoundCube Dev. - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| CONTENTS: |
| Shared functions and classes used in PHP projects |
diff --git a/program/include/session.inc b/program/include/session.inc
index c68b3dba9..35970c80f 100644
--- a/program/include/session.inc
+++ b/program/include/session.inc
@@ -6,7 +6,7 @@
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005, RoundCube Dev, - Switzerland |
- | All rights reserved. |
+ | Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide database supported session management |