summaryrefslogtreecommitdiff
path: root/program/steps
diff options
context:
space:
mode:
Diffstat (limited to 'program/steps')
-rw-r--r--program/steps/addressbook/delete.inc2
-rw-r--r--program/steps/addressbook/edit.inc2
-rw-r--r--program/steps/addressbook/func.inc2
-rw-r--r--program/steps/addressbook/list.inc2
-rw-r--r--program/steps/addressbook/save.inc2
-rw-r--r--program/steps/addressbook/show.inc2
-rw-r--r--program/steps/error.inc2
-rw-r--r--program/steps/mail/addcontact.inc2
-rw-r--r--program/steps/mail/compose.inc6
-rw-r--r--program/steps/mail/func.inc2
-rw-r--r--program/steps/mail/get.inc2
-rw-r--r--program/steps/mail/list.inc2
-rw-r--r--program/steps/mail/mark.inc2
-rw-r--r--program/steps/mail/move_del.inc2
-rw-r--r--program/steps/mail/sendmail.inc2
-rw-r--r--program/steps/mail/show.inc2
-rw-r--r--program/steps/mail/upload.inc2
-rw-r--r--program/steps/mail/viewsource.inc2
-rw-r--r--program/steps/settings/delete_identity.inc2
-rw-r--r--program/steps/settings/edit_identity.inc2
-rw-r--r--program/steps/settings/func.inc18
-rw-r--r--program/steps/settings/identities.inc2
-rw-r--r--program/steps/settings/manage_folders.inc2
-rw-r--r--program/steps/settings/save_identity.inc2
-rw-r--r--program/steps/settings/save_prefs.inc5
25 files changed, 43 insertions, 30 deletions
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'];
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-01 07:39:52 +0000