diff options
| author | thomascube <thomas@roundcube.net> | 2005-09-28 22:28:05 +0000 |
|---|---|---|
| committer | thomascube <thomas@roundcube.net> | 2005-09-28 22:28:05 +0000 |
| commit | 30233b8dfb7fe5070dfa11b3e6d2015fb50aa769 (patch) | |
| tree | 46cf5db699d97802e7c408c00a62e72dc22c640f | |
| parent | 20a1b3a0e1a46266b149a23562bb71680e666edb (diff) | |
Minor bugfixes and correction of confusing License notfications
47 files changed, 406 insertions, 51 deletions
@@ -24,3 +24,13 @@ CHANGELOG RoundCube Webmail - Support for IMAP root folder - Added support fot text/enriched messages - Make list of special mailboxes configurable + + +2005/09/28 +---------- +- Added French, Italian, Spanish, Danish translation +- Fixed PHP warnings (Bug #1299403) +- Fixed english translation bug #1295406 +- Fixed bug #1290833: Last character of email not seen +- Added setting for showing pretty dates + diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7ade7a6d8 --- /dev/null +++ b/LICENSE @@ -0,0 +1,281 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Library General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS @@ -0,0 +1,37 @@ +RoundCube Webmail (http://roundcube.net) + +Introduction: +------------- +RoundCube Webmail is a browser-based multilingual IMAP client with an +application-like user interface. It provides full functionality you expect from +an e-mail client, including MIME support, address book, folder manipulation and +message filters. RoundCube Webmail is written in PHP and requires the MySQL +database. The user interface is fully skinnable using XHTML and CSS 2. + +This project is meant to be a modern webmail solution which is easy to +install/configure and that runs on a standard PHP/MySQL configuration. It +includes open-source classes/libraries like PEAR (http://pear.php.net) and the +IMAP wrapper from IlohaMail (http://www.ilohamail.org). + +The current development skin uses icons designed by Stephen Horlander and Kevin +Gerich for Mozilla.org. + + +Installation: +------------- +For detailed instructions on how to install SquirrelMail on your server, +please refer to the INSTALL document in the same directory as this document. + + +Licensing: +---------- +This product is distributed under the GPL. Please read through the file +LICENSE for more information about our license. + + +Contact: +-------- +For any bug reports or feature requests please refer to the tracking system at sourceforge.net (http://sourceforge.net/tracker/?group_id=139281) or subscribe to our mailing list. See http://www.roundcube.net/?p=mailinglists for details. + +Your also welcome to send a message to the project admin: +roundcube@gmail.com @@ -13,3 +13,12 @@ from versions 0.1-alpha and 0.1-20050811 $rcmail_config['trash_mbox'] = 'Trash'; $rcmail_config['default_imap_folders'] = array('INBOX', 'Drafts', 'Sent', 'Junk', 'Trash'); $rcmail_config['prefer_html'] = TRUE; + $rcmail_config['prettydate'] = TRUE; + + +from version 0.1-20050820 +---------------------------------------- +- replace all files in folder /program/ +- add these line to /config/main.inc.php + $rcmail_config['prettydate'] = TRUE; + diff --git a/config/main.inc.php b/config/main.inc.php index 0e580318b..79bb96447 100644 --- a/config/main.inc.php +++ b/config/main.inc.php @@ -91,6 +91,9 @@ $rcmail_config['timezone'] = 1; // prefer displaying HTML messages $rcmail_config['prefer_html'] = TRUE; +// show pretty dates as standard +$rcmail_config['prettydate'] = TRUE; + // end of config file ?> 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 | diff --git a/program/js/app.js b/program/js/app.js index d8afc0e64..87fd25572 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -4,7 +4,7 @@ | | | This file is part of the RoundCube Webmail client | | Copyright (C) 2005, RoundCube Dev, - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | | Modified: 2005/08/19 (tbr) | | | diff --git a/program/js/common.js b/program/js/common.js index 0947bbd1f..5263a87ab 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -4,7 +4,7 @@ | | | This file is part of the RoundCube web development suite | | Copyright (C) 2005, RoundCube Dev, - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | | Modified: 19.08.2005 (tbr) | | | diff --git a/program/lib/Mail/mime.php b/program/lib/Mail/mime.php index 830352c42..da43d15ae 100644 --- a/program/lib/Mail/mime.php +++ b/program/lib/Mail/mime.php @@ -3,7 +3,7 @@ // +-----------------------------------------------------------------------+ // | Copyright (c) 2002-2003 Richard Heyes | // | Copyright (c) 2003-2005 The PHP Group | -// | All rights reserved. | +// | Licensed under the GNU GPL | // | | // | Redistribution and use in source and binary forms, with or without | // | modification, are permitted provided that the following conditions | diff --git a/program/lib/Mail/mimeDecode.php b/program/lib/Mail/mimeDecode.php index 92827b727..5bcf4fb31 100644 --- a/program/lib/Mail/mimeDecode.php +++ b/program/lib/Mail/mimeDecode.php @@ -3,7 +3,7 @@ // +-----------------------------------------------------------------------+ // | Copyright (c) 2002-2003 Richard Heyes | // | Copyright (c) 2003-2005 The PHP Group | -// | All rights reserved. | +// | Licensed under the GNU GPL | // | | // | Redistribution and use in source and binary forms, with or without | // | modification, are permitted provided that the following conditions | diff --git a/program/lib/Mail/mimePart.php b/program/lib/Mail/mimePart.php index b429b905e..45a00523d 100644 --- a/program/lib/Mail/mimePart.php +++ b/program/lib/Mail/mimePart.php @@ -1,7 +1,7 @@ <?php // +-----------------------------------------------------------------------+ // | Copyright (c) 2002-2003 Richard Heyes | -// | All rights reserved. | +// | Licensed under the GNU GPL | // | | // | Redistribution and use in source and binary forms, with or without | // | modification, are permitted provided that the following conditions | diff --git a/program/lib/imap.inc b/program/lib/imap.inc index 53a518bee..9ee476ee1 100644 --- a/program/lib/imap.inc +++ b/program/lib/imap.inc @@ -840,7 +840,7 @@ function iil_C_UIDToMID(&$conn, $mailbox, $uid){ function iil_C_FetchUIDs(&$conn,$mailbox){ global $clock; - $num = iil_C_CountMessages(&$conn, $mailbox); + $num = iil_C_CountMessages($conn, $mailbox); if ($num==0) return array(); $message_set = '1'.($num>1?':'.$num:''); @@ -1812,7 +1812,7 @@ function iil_C_HandlePartBody(&$conn, $mailbox, $id, $part, $mode){ if ($result){ $result = chop($result); - return substr($result, 0, strlen($result)-1); + return $result; // substr($result, 0, strlen($result)-1); }else return false; }else{ echo "Select failed."; diff --git a/program/localization/de/labels.inc b/program/localization/de/labels.inc index 4e5a97b40..08fd870c0 100644 --- a/program/localization/de/labels.inc +++ b/program/localization/de/labels.inc @@ -6,7 +6,7 @@ | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005, RoundQube Dev. - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | @@ -64,6 +64,7 @@ $labels['filesize'] = 'Dateigrösse'; $labels['preferhtml'] = 'HTML bevorzugen'; $labels['htmlmessage'] = 'HTML Nachricht'; +$labels['prettydate'] = 'Kurze Datumsanzeige'; $labels['addtoaddressbook'] = 'Ins Adressbuch übernehmen'; diff --git a/program/localization/de/messages.inc b/program/localization/de/messages.inc index 518d6e3e1..c90bb4c35 100644 --- a/program/localization/de/messages.inc +++ b/program/localization/de/messages.inc @@ -6,7 +6,7 @@ | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005, RoundCube Dev. - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | diff --git a/program/localization/en/labels.inc b/program/localization/en/labels.inc index 4b424136e..97d455c74 100644 --- a/program/localization/en/labels.inc +++ b/program/localization/en/labels.inc @@ -6,7 +6,7 @@ | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005, RoundQube Dev. - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | @@ -64,6 +64,7 @@ $labels['filesize'] = 'File size'; $labels['preferhtml'] = 'Prefer HTML'; $labels['htmlmessage'] = 'HTML Message'; +$labels['prettydate'] = 'Pretty dates'; $labels['addtoaddressbook'] = 'Add to address book'; diff --git a/program/localization/en/messages.inc b/program/localization/en/messages.inc index 68273931e..4a9009aa7 100644 --- a/program/localization/en/messages.inc +++ b/program/localization/en/messages.inc @@ -6,7 +6,7 @@ | | | Language file of the RoundCube Webmail client | | Copyright (C) 2005, RoundCube Dev. - Switzerland | - | All rights reserved. | + | Licensed under the GNU GPL | | | +-----------------------------------------------------------------------+ | Author: Thomas Bruederli <roundcube@gmail.com> | diff --git a/program/steps/addressbook/delete.inc b/program/steps/addressbook/delete.inc index 99d9e33d4..789d84149 100644 --- a/program/steps/addressbook/delete.inc +++ b/program/steps/addressbook/delete.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: | | Delete the submitted contacts (CIDs) from the users address book | diff --git a/program/steps/addressbook/edit.inc b/program/steps/addressbook/edit.inc index db7b77a59..3c5a544d3 100644 --- a/program/steps/addressbook/edit.inc +++ b/program/steps/addressbook/edit.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: | | Show edit form for a contact entry or to add a new one | diff --git a/program/steps/addressbook/func.inc b/program/steps/addressbook/func.inc index 309c2a3a2..7858a4e88 100644 --- a/program/steps/addressbook/func.inc +++ b/program/steps/addressbook/func.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 addressbook functionality and GUI objects | diff --git a/program/steps/addressbook/list.inc b/program/steps/addressbook/list.inc index 87ac888de..2c5148a91 100644 --- a/program/steps/addressbook/list.inc +++ b/program/steps/addressbook/list.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: | | Send contacts list to client (as remote response) | diff --git a/program/steps/addressbook/save.inc b/program/steps/addressbook/save.inc index c0afd23d8..62cc5d8a6 100644 --- a/program/steps/addressbook/save.inc +++ b/program/steps/addressbook/save.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: | | Save a contact entry or to add a new one | diff --git a/program/steps/addressbook/show.inc b/program/steps/addressbook/show.inc index 9317645d0..4129cd27f 100644 --- a/program/steps/addressbook/show.inc +++ b/program/steps/addressbook/show.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: | | Show contact details | diff --git a/program/steps/error.inc b/program/steps/error.inc index f2d639bf6..efe30407e 100644 --- a/program/steps/error.inc +++ b/program/steps/error.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: | | Display error message page | diff --git a/program/steps/mail/addcontact.inc b/program/steps/mail/addcontact.inc index 7f1102412..465ed3125 100644 --- a/program/steps/mail/addcontact.inc +++ b/program/steps/mail/addcontact.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: | | Add the submitted contact to the users address book | diff --git a/program/steps/mail/compose.inc b/program/steps/mail/compose.inc index b7e91cb2f..1848acf23 100644 --- a/program/steps/mail/compose.inc +++ b/program/steps/mail/compose.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: | | Compose a new mail message with all headers and attachments | @@ -283,7 +283,7 @@ function rcmail_compose_body($attrib) // use posted message body if ($_POST['_message']) - $body = $_POST['_message']; + $body = stripslashes($_POST['_message']); // compose reply-body else if (is_array($REPLY_MESSAGE['parts'])) @@ -371,7 +371,7 @@ function rcmail_compose_subject($attrib) // use subject from post if ($_POST['_subject']) - $subject = $_POST['_subject']; + $subject = stripslashes($_POST['_subject']); // create a reply-subject else if (isset($REPLY_MESSAGE['subject'])) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index d53b8b0c3..78b61377b 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.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 webmail functionality and GUI objects | diff --git a/program/steps/mail/get.inc b/program/steps/mail/get.inc index 018ae2e4c..9a86177aa 100644 --- a/program/steps/mail/get.inc +++ b/program/steps/mail/get.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: | | Delivering a specific part of a mail message | diff --git a/program/steps/mail/list.inc b/program/steps/mail/list.inc index 58a1bb84e..0ddf5cc11 100644 --- a/program/steps/mail/list.inc +++ b/program/steps/mail/list.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: | | Send message list to client (as remote response) | diff --git a/program/steps/mail/mark.inc b/program/steps/mail/mark.inc index 2dadb53eb..be9814ecb 100644 --- a/program/steps/mail/mark.inc +++ b/program/steps/mail/mark.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: | | Mark the submitted messages with the specified flag | diff --git a/program/steps/mail/move_del.inc b/program/steps/mail/move_del.inc index e090d305b..4972478f1 100644 --- a/program/steps/mail/move_del.inc +++ b/program/steps/mail/move_del.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: | | Move the submitted messages to a specific mailbox or delete them | diff --git a/program/steps/mail/sendmail.inc b/program/steps/mail/sendmail.inc index 789001e14..e33593139 100644 --- a/program/steps/mail/sendmail.inc +++ b/program/steps/mail/sendmail.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: | | Compose a new mail message with all headers and attachments | diff --git a/program/steps/mail/show.inc b/program/steps/mail/show.inc index de4f2b4cb..d9ff5d443 100644 --- a/program/steps/mail/show.inc +++ b/program/steps/mail/show.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: | | Display a mail message similar as a usual mail application does | diff --git a/program/steps/mail/upload.inc b/program/steps/mail/upload.inc index 4f1eb3dab..3ae88fad6 100644 --- a/program/steps/mail/upload.inc +++ b/program/steps/mail/upload.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: | | Handle file-upload and make them available as attachments | diff --git a/program/steps/mail/viewsource.inc b/program/steps/mail/viewsource.inc index 8b8c90cd1..0fcb1f9c5 100644 --- a/program/steps/mail/viewsource.inc +++ b/program/steps/mail/viewsource.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: | | Display a mail message similar as a usual mail application does | diff --git a/program/steps/settings/delete_identity.inc b/program/steps/settings/delete_identity.inc index dacfc0563..58fda4970 100644 --- a/program/steps/settings/delete_identity.inc +++ b/program/steps/settings/delete_identity.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: | | Delete the submitted identities (IIDs) from the database | diff --git a/program/steps/settings/edit_identity.inc b/program/steps/settings/edit_identity.inc index f4134d329..f9cbc7c96 100644 --- a/program/steps/settings/edit_identity.inc +++ b/program/steps/settings/edit_identity.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: | | Show edit form for a identity record or to add a new one | diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc index c48f41c90..60b1056dd 100644 --- a/program/steps/settings/func.inc +++ b/program/steps/settings/func.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 functionality for user's settings & preferences | @@ -44,9 +44,10 @@ function rcmail_user_prefs_form($attrib) // return the complete edit form as table $out = "$form_start<table" . $attrib_str . ">\n\n"; - $a_show_cols = array('language' => array('type' => 'text'), - 'pagesize' => array('type' => 'text'), - 'timezone' => array('type' => 'text')); + $a_show_cols = array('language' => array('type' => 'text'), + 'pagesize' => array('type' => 'text'), + 'timezone' => array('type' => 'text'), + 'prettydate' => array('type' => 'text')); // show language selection $field_id = 'rcmfd_lang'; @@ -120,6 +121,15 @@ function rcmail_user_prefs_form($attrib) rcube_label('preferhtml'), $input_pagesize->show($CONFIG['prefer_html']?1:0)); + // MM: Show checkbox for toggling 'pretty dates' + $field_id = 'rcmfd_prettydate'; + $input_prettydate = new checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1)); + + $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s</td></tr>\n", + $field_id, + rcube_label('prettydate'), + $input_prettydate->show($CONFIG['prettydate']?1:0)); + $out .= "\n</table>$form_end"; diff --git a/program/steps/settings/identities.inc b/program/steps/settings/identities.inc index b760f09bf..8bad6859a 100644 --- a/program/steps/settings/identities.inc +++ b/program/steps/settings/identities.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: | | Manage identities of a user account | diff --git a/program/steps/settings/manage_folders.inc b/program/steps/settings/manage_folders.inc index 38f9e1a0e..8d74ab031 100644 --- a/program/steps/settings/manage_folders.inc +++ b/program/steps/settings/manage_folders.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 functionality to create/delete/rename folders | diff --git a/program/steps/settings/save_identity.inc b/program/steps/settings/save_identity.inc index b4b1fec27..39bf8fa84 100644 --- a/program/steps/settings/save_identity.inc +++ b/program/steps/settings/save_identity.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: | | Save an identity record or to add a new one | diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc index 1524b9ead..7cc327028 100644 --- a/program/steps/settings/save_prefs.inc +++ b/program/steps/settings/save_prefs.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: | | Save user preferences to DB and to the current session | @@ -28,6 +28,9 @@ $a_user_prefs['timezone'] = isset($_POST['_timezone']) ? (int)$_POST['_timezone' $a_user_prefs['pagesize'] = is_numeric($_POST['_pagesize']) ? (int)$_POST['_pagesize'] : $CONFIG['pagesize']; $a_user_prefs['prefer_html'] = isset($_POST['_prefer_html']) ? TRUE : FALSE; +// MM: Date format toggle (Pretty / Standard) +$a_user_prefs['prettydate'] = isset($_POST['_pretty_date']) ? TRUE : FALSE; + if (isset($_POST['_language'])) $sess_user_lang = $_SESSION['user_lang'] = $_POST['_language']; |