summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--CHANGELOG2
-rw-r--r--program/localization/en_US/labels.inc3
-rw-r--r--program/localization/et_EE/labels.inc3
-rw-r--r--program/localization/nl_NL/labels.inc3
-rw-r--r--program/localization/pt_PT/labels.inc3
-rw-r--r--program/steps/settings/func.inc25
-rw-r--r--program/steps/settings/save_prefs.inc2
7 files changed, 1 insertions, 40 deletions
diff --git a/CHANGELOG b/CHANGELOG
index f54a41be1..4b5307d31 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,7 +4,7 @@ CHANGELOG RoundCube Webmail
2008/05/16 (alec)
----------
- In Preferences added possibility to configure 'read_when_deleted',
- 'mdn_requests', 'message_sort_col' and 'message_sort_order' options
+ 'mdn_requests' options
2008/05/15 (thomasb)
----------
diff --git a/program/localization/en_US/labels.inc b/program/localization/en_US/labels.inc
index 35115f016..94f1521b4 100644
--- a/program/localization/en_US/labels.inc
+++ b/program/localization/en_US/labels.inc
@@ -256,13 +256,10 @@ $labels['uisettings'] = 'User Interface';
$labels['serversettings'] = 'Server Settings';
$labels['mailboxview'] = 'Mailbox View';
$labels['mdnrequests'] = 'Sender notifications';
-$labels['descending'] = 'descending';
-$labels['ascending'] = 'ascending';
$labels['askuser'] = 'ask the user';
$labels['autosend'] = 'send automatically';
$labels['ignore'] = 'ignore';
$labels['readwhendeleted'] = 'Mark the message as read on delete';
-$labels['messagesorder'] = 'Messages order';
$labels['autosavedraft'] = 'Automatically save draft';
$labels['everynminutes'] = 'every $n minutes';
diff --git a/program/localization/et_EE/labels.inc b/program/localization/et_EE/labels.inc
index 79e8016fb..aee349333 100644
--- a/program/localization/et_EE/labels.inc
+++ b/program/localization/et_EE/labels.inc
@@ -201,13 +201,10 @@ $labels['uisettings'] = 'Kasutajaliides';
$labels['serversettings'] = 'Serveri seaded';
$labels['mailboxview'] = 'Postkasti vaade';
$labels['mdnrequests'] = 'Kättesaamis kinnitus';
-$labels['descending'] = 'kahanevalt';
-$labels['ascending'] = 'kasvavalt';
$labels['askuser'] = 'küsi kasutajalt';
$labels['autosend'] = 'saada automaatselt';
$labels['ignore'] = 'ignoreeri';
$labels['readwhendeleted'] = 'Märgi kiri kustutamisel loetuks';
-$labels['messagesorder'] = 'Kirjade järjestus';
$labels['autosavedraft'] = 'Salvesta mustandid automaatselt';
$labels['everynminutes'] = 'iga $n minuti tagant';
$labels['never'] = 'mitte kunagi';
diff --git a/program/localization/nl_NL/labels.inc b/program/localization/nl_NL/labels.inc
index 73c625497..70b1d156a 100644
--- a/program/localization/nl_NL/labels.inc
+++ b/program/localization/nl_NL/labels.inc
@@ -199,13 +199,10 @@ $labels['logoutclear'] = 'Prullenbak legen bij uitloggen';
$labels['logoutcompact'] = 'Postvak IN opschonen bij uitloggen';
$labels['uisettings'] = 'Gebruikers Interface';
$labels['serversettings'] = 'Server Instellingen';
-$labels['descending'] = 'aflopend';
-$labels['ascending'] = 'oplopend';
$labels['askuser'] = 'vraag de gebruiker';
$labels['autosend'] = 'stuur automatisch';
$labels['ignore'] = 'negeer';
$labels['readwhendeleted'] = 'Markeer het bericht na verwijderen als gelezen';
-$labels['messagesorder'] = 'Bericht volgorde';
$labels['autosavedraft'] = 'Concept automatisch opslaan';
$labels['everynminutes'] = 'iedere $n minuten';
$labels['never'] = 'nooit';
diff --git a/program/localization/pt_PT/labels.inc b/program/localization/pt_PT/labels.inc
index 4dc7ef532..9ae4e07e0 100644
--- a/program/localization/pt_PT/labels.inc
+++ b/program/localization/pt_PT/labels.inc
@@ -221,12 +221,9 @@ $labels['sortasc'] = 'Ascendente';
$labels['sortdesc'] = 'Descendente';
$labels['mailboxview'] = 'Visualizar caixa de Entrada';
$labels['mdnrequests'] = 'Enviar Notificações';
-$labels['descending'] = 'Descendente';
-$labels['ascending'] = 'Ascendente';
$labels['askuser'] = 'Perguntar ao ultilizador';
$labels['autosend'] = 'enviar automáticamente';
$labels['ignore'] = 'ignorar';
$labels['readwhendeleted'] = 'Marcar a mensagem como lida ao excluir';
-$labels['messagesorder'] = 'Ordem das mensagens';
?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index 32e863e72..a3dd758dd 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -188,31 +188,6 @@ function rcmail_user_prefs_form($attrib)
$out .= "</table></fieldset>\n<fieldset><legend>" . Q(rcube_label('mailboxview')) . "</legend>\n<table" . $attrib_str . ">\n\n";
- if (!isset($no_override['message_sort_col']))
- {
- $field_id = 'rcmfd_sort_col';
- $select_sort_col = new html_select(array('name' => '_message_sort_col', 'id' => $field_id));
- $select_sort_col->add(rcube_label('subject'), 'subject');
- $select_sort_col->add(rcube_label('date'), 'date');
- $select_sort_col->add(rcube_label('from'), 'from');
- $select_sort_col->add(rcube_label('to'), 'to');
- $select_sort_col->add(rcube_label('size'), 'size');
-
- if (!isset($no_override['message_sort_order']))
- {
- $select_sort_order = new html_select(array('name' => '_message_sort_order', 'id' => 'rcmfd_sort_order'));
- $select_sort_order->add(rcube_label('ascending'), 'ASC');
- $select_sort_order->add(rcube_label('descending'), 'DESC');
- }
-
- $out .= sprintf("<tr><td class=\"title\"><label for=\"%s\">%s</label></td><td>%s %s</td></tr>\n",
- $field_id,
- Q(rcube_label('messagesorder')),
- $select_sort_col->show($config['message_sort_col']),
- (isset($select_sort_order) ? $select_sort_order->show($config['message_sort_order']) : ''));
- }
-
-
// show config parameter for preview pane
if (!isset($no_override['preview_pane']))
{
diff --git a/program/steps/settings/save_prefs.inc b/program/steps/settings/save_prefs.inc
index c9c2fd3bf..a373961db 100644
--- a/program/steps/settings/save_prefs.inc
+++ b/program/steps/settings/save_prefs.inc
@@ -32,8 +32,6 @@ $a_user_prefs = array(
'logout_expunge' => isset($_POST['_logout_expunge']) ? TRUE : FALSE,
'draft_autosave' => isset($_POST['_draft_autosave']) ? intval($_POST['_draft_autosave']) : 0,
'mdn_requests' => isset($_POST['_mdn_requests']) ? intval($_POST['_mdn_requests']) : 0,
- 'message_sort_col' => isset($_POST['_message_sort_col']) ? get_input_value('_message_sort_col', RCUBE_INPUT_POST) : 'date',
- 'message_sort_order' => isset($_POST['_message_sort_order']) ? get_input_value('_message_sort_order', RCUBE_INPUT_POST) : '',
);
// don't override these parameters