From 30233b8dfb7fe5070dfa11b3e6d2015fb50aa769 Mon Sep 17 00:00:00 2001 From: thomascube Date: Wed, 28 Sep 2005 22:28:05 +0000 Subject: Minor bugfixes and correction of confusing License notfications --- program/steps/settings/delete_identity.inc | 2 +- program/steps/settings/edit_identity.inc | 2 +- program/steps/settings/func.inc | 18 ++++++++++++++---- program/steps/settings/identities.inc | 2 +- program/steps/settings/manage_folders.inc | 2 +- program/steps/settings/save_identity.inc | 2 +- program/steps/settings/save_prefs.inc | 5 ++++- 7 files changed, 23 insertions(+), 10 deletions(-) (limited to 'program/steps/settings') 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\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("%s\n", + $field_id, + rcube_label('prettydate'), + $input_prettydate->show($CONFIG['prettydate']?1:0)); + $out .= "\n$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']; -- cgit v1.2.3