Page MenuHomePhorge
Files F224766

No OneTemporary
Actions

View Options

diff --git a/program/include/html.php b/program/include/html.php
index 9268acacc..032915f1f 100644
--- a/program/include/html.php
+++ b/program/include/html.php
@@ -1,674 +1,684 @@
<?php
/*
+-----------------------------------------------------------------------+
| program/include/html.php |
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005-2008, RoundCube Dev, - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
| Helper class to create valid XHTML code |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
$Id: $
*/
/**
* Class for HTML code creation
*
* @package HTML
*/
class html
{
protected $tagname;
protected $attrib = array();
protected $allowed = array();
protected $content;
public static $common_attrib = array('id','class','style','title','align');
public static $containers = array('iframe','div','span','p','h1','h2','h3','form','textarea','table','tr','th','td','style');
public static $lc_tags = true;
/**
* Constructor
*
* @param array Hash array with tag attributes
*/
public function __construct($attrib = array())
{
if (is_array($attrib)) {
$this->attrib = $attrib;
}
}
/**
* Return the tag code
*
* @return string The finally composed HTML tag
*/
public function show()
{
return self::tag($this->tagname, $this->attrib, $this->content, array_merge(self::$common_attrib, $this->allowed));
}
/****** STATIC METHODS *******/
/**
* Generic method to create a HTML tag
*
* @param string Tag name
* @param array Tag attributes as key/value pairs
* @param string Optinal Tag content (creates a container tag)
* @param array List with allowed attributes, omit to allow all
* @return string The XHTML tag
*/
public static function tag($tagname, $attrib = array(), $content = null, $allowed_attrib = null)
{
$inline_tags = array('a','span','img');
$suffix = $attrib['nl'] || ($content && $attrib['nl'] !== false && !in_array($tagname, $inline_tags)) ? "\n" : '';
$tagname = self::$lc_tags ? strtolower($tagname) : $tagname;
if ($content || in_array($tagname, self::$containers)) {
$templ = $attrib['noclose'] ? "<%s%s>%s" : "<%s%s>%s</%s>%s";
unset($attrib['noclose']);
return sprintf($templ, $tagname, self::attrib_string($attrib, $allowed_attrib), $content, $tagname, $suffix);
}
else {
return sprintf("<%s%s />%s", $tagname, self::attrib_string($attrib, $allowed_attrib), $suffix);
}
}
/**
* Derrived method for <div> containers
*
* @param mixed Hash array with tag attributes or string with class name
* @param string Div content
* @return string HTML code
* @see html::tag()
*/
public static function div($attr = null, $cont = null)
{
if (is_string($attr)) {
$attr = array('class' => $attr);
}
return self::tag('div', $attr, $cont, array_merge(self::$common_attrib, array('onclick')));
}
/**
* Derrived method for <p> blocks
*
* @param mixed Hash array with tag attributes or string with class name
* @param string Paragraph content
* @return string HTML code
* @see html::tag()
*/
public static function p($attr = null, $cont = null)
{
if (is_string($attr)) {
$attr = array('class' => $attr);
}
return self::tag('p', $attr, $cont, self::$common_attrib);
}
/**
* Derrived method to create <img />
*
* @param mixed Hash array with tag attributes or string with image source (src)
* @return string HTML code
* @see html::tag()
*/
public static function img($attr = null)
{
if (is_string($attr)) {
$attr = array('src' => $attr);
}
return self::tag('img', $attr + array('alt' => ''), null, array_merge(self::$common_attrib, array('src','alt','width','height','border','usemap')));
}
/**
* Derrived method for link tags
*
* @param mixed Hash array with tag attributes or string with link location (href)
* @param string Link content
* @return string HTML code
* @see html::tag()
*/
public static function a($attr, $cont)
{
if (is_string($attr)) {
$attr = array('href' => $attr);
}
return self::tag('a', $attr, $cont, array_merge(self::$common_attrib, array('href','target','name','onclick','onmouseover','onmouseout','onmousedown','onmouseup')));
}
/**
* Derrived method for inline span tags
*
* @param mixed Hash array with tag attributes or string with class name
* @param string Tag content
* @return string HTML code
* @see html::tag()
*/
public static function span($attr, $cont)
{
if (is_string($attr)) {
$attr = array('class' => $attr);
}
return self::tag('span', $attr, $cont, self::$common_attrib);
}
/**
* Derrived method for form element labels
*
* @param mixed Hash array with tag attributes or string with 'for' attrib
* @param string Tag content
* @return string HTML code
* @see html::tag()
*/
public static function label($attr, $cont)
{
if (is_string($attr)) {
$attr = array('for' => $attr);
}
return self::tag('label', $attr, $cont, array_merge(self::$common_attrib, array('for')));
}
/**
* Derrived method to create <iframe></iframe>
*
* @param mixed Hash array with tag attributes or string with frame source (src)
* @return string HTML code
* @see html::tag()
*/
public static function iframe($attr = null, $cont = null)
{
if (is_string($attr)) {
$attr = array('src' => $attr);
}
return self::tag('iframe', $attr, $cont, array_merge(self::$common_attrib, array('src','name','width','height','border','frameborder')));
}
/**
* Derrived method for line breaks
*
* @return string HTML code
* @see html::tag()
*/
public static function br()
{
return self::tag('br');
}
/**
* Create string with attributes
*
* @param array Associative arry with tag attributes
* @param array List of allowed attributes
* @return string Valid attribute string
*/
public static function attrib_string($attrib = array(), $allowed = null)
{
if (empty($attrib)) {
return '';
}
$allowed_f = array_flip((array)$allowed);
$attrib_arr = array();
foreach ($attrib as $key => $value) {
// skip size if not numeric
if (($key=='size' && !is_numeric($value))) {
continue;
}
// ignore "internal" or not allowed attributes
if ($key == 'nl' || ($allowed && !isset($allowed_f[$key])) || $value === null) {
continue;
}
// skip empty eventhandlers
if (preg_match('/^on[a-z]+/', $key) && !$value) {
continue;
}
// attributes with no value
if (in_array($key, array('checked', 'multiple', 'disabled', 'selected'))) {
if ($value) {
$attrib_arr[] = sprintf('%s="%s"', $key, $key);
}
}
else if ($key=='value') {
$attrib_arr[] = sprintf('%s="%s"', $key, Q($value, 'strict', false));
}
else {
$attrib_arr[] = sprintf('%s="%s"', $key, Q($value));
}
}
return count($attrib_arr) ? ' '.implode(' ', $attrib_arr) : '';
}
}
/**
* Class to create an HTML input field
*
* @package HTML
*/
class html_inputfield extends html
{
protected $tagname = 'input';
protected $type = 'text';
protected $allowed = array('type','name','value','size','tabindex','autocomplete','checked','onchange','onclick','disabled','readonly','spellcheck','results');
public function __construct($attrib = array())
{
if (is_array($attrib)) {
$this->attrib = $attrib;
}
if ($attrib['type']) {
$this->type = $attrib['type'];
}
if ($attrib['newline']) {
$this->newline = true;
}
}
/**
* Compose input tag
*
* @param string Field value
* @param array Additional attributes to override
* @return string HTML output
*/
public function show($value = null, $attrib = null)
{
// overwrite object attributes
if (is_array($attrib)) {
$this->attrib = array_merge($this->attrib, $attrib);
}
// set value attribute
if ($value !== null) {
$this->attrib['value'] = $value;
}
// set type
$this->attrib['type'] = $this->type;
return parent::show();
}
}
/**
* Class to create an HTML password field
*
* @package HTML
*/
class html_passwordfield extends html_inputfield
{
protected $type = 'password';
}
/**
* Class to create an hidden HTML input field
*
* @package HTML
*/
class html_hiddenfield extends html_inputfield
{
protected $type = 'hidden';
protected $fields_arr = array();
protected $newline = true;
/**
* Constructor
*
* @param array Named tag attributes
*/
public function __construct($attrib = null)
{
if (is_array($attrib)) {
$this->add($attrib);
}
}
/**
* Add a hidden field to this instance
*
* @param array Named tag attributes
*/
public function add($attrib)
{
$this->fields_arr[] = $attrib;
}
/**
* Create HTML code for the hidden fields
*
* @return string Final HTML code
*/
public function show()
{
$out = '';
foreach ($this->fields_arr as $attrib) {
$out .= self::tag($this->tagname, array('type' => $this->type) + $attrib);
}
return $out;
}
}
/**
* Class to create HTML radio buttons
*
* @package HTML
*/
class html_radiobutton extends html_inputfield
{
protected $type = 'radio';
/**
* Get HTML code for this object
*
* @param string Value of the checked field
* @param array Additional attributes to override
* @return string HTML output
*/
public function show($value = '', $attrib = null)
{
// overwrite object attributes
if (is_array($attrib)) {
$this->attrib = array_merge($this->attrib, $attrib);
}
// set value attribute
$this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);
return parent::show();
}
}
/**
* Class to create HTML checkboxes
*
* @package HTML
*/
class html_checkbox extends html_inputfield
{
protected $type = 'checkbox';
/**
* Get HTML code for this object
*
* @param string Value of the checked field
* @param array Additional attributes to override
* @return string HTML output
*/
public function show($value = '', $attrib = null)
{
// overwrite object attributes
if (is_array($attrib)) {
$this->attrib = array_merge($this->attrib, $attrib);
}
// set value attribute
$this->attrib['checked'] = ((string)$value == (string)$this->attrib['value']);
return parent::show();
}
}
/**
* Class to create an HTML textarea
*
* @package HTML
*/
class html_textarea extends html
{
protected $tagname = 'textarea';
protected $allowed = array('name','rows','cols','wrap','tabindex','onchange','disabled','readonly','spellcheck');
/**
* Get HTML code for this object
*
* @param string Textbox value
* @param array Additional attributes to override
* @return string HTML output
*/
public function show($value = '', $attrib = null)
{
// overwrite object attributes
if (is_array($attrib)) {
$this->attrib = array_merge($this->attrib, $attrib);
}
// take value attribute as content
if (empty($value) && !empty($this->attrib['value'])) {
$value = $this->attrib['value'];
}
// make shure we don't print the value attribute
if (isset($this->attrib['value'])) {
unset($this->attrib['value']);
}
if (!empty($value) && !ereg('mce_editor', $this->attrib['class'])) {
$value = Q($value, 'strict', false);
}
return self::tag($this->tagname, $this->attrib, $value, array_merge(self::$common_attrib, $this->allowed));
}
}
/**
* Builder for HTML drop-down menus
* Syntax:<pre>
* // create instance. arguments are used to set attributes of select-tag
* $select = new html_select(array('name' => 'fieldname'));
*
* // add one option
* $select->add('Switzerland', 'CH');
*
* // add multiple options
* $select->add(array('Switzerland','Germany'), array('CH','DE'));
*
* // generate pulldown with selection 'Switzerland' and return html-code
* // as second argument the same attributes available to instanciate can be used
* print $select->show('CH');
* </pre>
*
* @package HTML
*/
class html_select extends html
{
protected $tagname = 'select';
protected $options = array();
protected $allowed = array('name','size','tabindex','autocomplete','multiple','onchange','disabled');
/**
* Add a new option to this drop-down
*
* @param mixed Option name or array with option names
* @param mixed Option value or array with option values
*/
public function add($names, $values = null)
{
if (is_array($names)) {
foreach ($names as $i => $text) {
$this->options[] = array('text' => $text, 'value' => $values[$i]);
}
}
else {
$this->options[] = array('text' => $names, 'value' => $values);
}
}
/**
* Get HTML code for this object
*
* @param string Value of the selection option
* @param array Additional attributes to override
* @return string HTML output
*/
public function show($select = array(), $attrib = null)
{
// overwrite object attributes
if (is_array($attrib)) {
$this->attrib = array_merge($this->attrib, $attrib);
}
$this->content = "\n";
$select = (array)$select;
foreach ($this->options as $option) {
$attr = array(
'value' => $option['value'],
'selected' => (in_array($option['value'], $select, true) ||
in_array($option['text'], $select, true)) ? 1 : null);
$this->content .= self::tag('option', $attr, Q($option['text']));
}
return parent::show();
}
}
/**
* Class to build an HTML table
*
* @package HTML
*/
class html_table extends html
{
protected $tagname = 'table';
protected $allowed = array('id','class','style','width','summary','cellpadding','cellspacing','border');
private $header = array();
private $rows = array();
private $rowindex = 0;
private $colindex = 0;
public function __construct($attrib = array())
{
$this->attrib = array_merge($attrib, array('summary' => '', 'border' => 0));
}
/**
* Add a table cell
*
* @param array Cell attributes
* @param string Cell content
*/
public function add($attr, $cont)
{
if (is_string($attr)) {
$attr = array('class' => $attr);
}
$cell = new stdClass;
$cell->attrib = $attr;
$cell->content = $cont;
$this->rows[$this->rowindex]->cells[$this->colindex] = $cell;
$this->colindex++;
if ($this->attrib['cols'] && $this->colindex == $this->attrib['cols']) {
$this->add_row();
}
}
/**
* Add a table header cell
*
* @param array Cell attributes
* @param string Cell content
*/
public function add_header($attr, $cont)
{
if (is_string($attr))
$attr = array('class' => $attr);
$cell = new stdClass;
$cell->attrib = $attr;
$cell->content = $cont;
$this->header[] = $cell;
}
/**
* Jump to next row
*
* @param array Row attributes
*/
public function add_row($attr = array())
{
$this->rowindex++;
$this->colindex = 0;
$this->rows[$this->rowindex] = new stdClass;
$this->rows[$this->rowindex]->attrib = $attr;
$this->rows[$this->rowindex]->cells = array();
}
/**
* Set current row attrib
*
* @param array Row attributes
*/
public function set_row_attribs($attr = array())
{
if (is_string($attr))
$attr = array('class' => $attr);
$this->rows[$this->rowindex]->attrib = $attr;
}
/**
* Build HTML output of the table data
*
* @param array Table attributes
* @return string The final table HTML code
*/
public function show($attrib = null)
{
if (is_array($attrib))
$this->attrib = array_merge($this->attrib, $attrib);
$thead = $tbody = "";
// include <thead>
if (!empty($this->header)) {
$rowcontent = '';
foreach ($this->header as $c => $col) {
$rowcontent .= self::tag('td', $col->attrib, $col->content);
}
$thead = self::tag('thead', null, self::tag('tr', null, $rowcontent));
}
foreach ($this->rows as $r => $row) {
$rowcontent = '';
foreach ($row->cells as $c => $col) {
$rowcontent .= self::tag('td', $col->attrib, $col->content);
}
if ($r < $this->rowindex || count($row->cells)) {
$tbody .= self::tag('tr', $row->attrib, $rowcontent);
}
}
if ($this->attrib['rowsonly']) {
return $tbody;
}
// add <tbody>
$this->content = $thead . self::tag('tbody', null, $tbody);
unset($this->attrib['cols'], $this->attrib['rowsonly']);
return parent::show();
}
+
+ /**
+ * Count number of rows
+ *
+ * @return The number of rows
+ */
+ public function size()
+ {
+ return count($this->rows);
+ }
}
?>
diff --git a/program/steps/settings/func.inc b/program/steps/settings/func.inc
index e25a1879f..b6f86edd7 100644
--- a/program/steps/settings/func.inc
+++ b/program/steps/settings/func.inc
@@ -1,453 +1,498 @@
<?php
/*
+-----------------------------------------------------------------------+
| program/steps/settings/func.inc |
| |
| This file is part of the RoundCube Webmail client |
| Copyright (C) 2005-2007, RoundCube Dev. - Switzerland |
| Licensed under the GNU GPL |
| |
| PURPOSE: |
| Provide functionality for user's settings & preferences |
| |
+-----------------------------------------------------------------------+
| Author: Thomas Bruederli <roundcube@gmail.com> |
+-----------------------------------------------------------------------+
$Id$
*/
if (!$OUTPUT->ajax_call)
$OUTPUT->set_pagetitle(rcube_label('preferences'));
function rcmail_user_prefs_form($attrib)
{
global $RCMAIL;
- $config = $RCMAIL->config->all();
- $no_override = is_array($config['dont_override']) ? array_flip($config['dont_override']) : array();
+ $no_override = array_flip($RCMAIL->config->get('dont_override', array()));
+ $blocks = $attrib['parts'] ? preg_split('/[\s,;]+/', strip_quotes($attrib['parts'])) : array('general','mailbox','compose','mailview','folders','server');
// add some labels to client
$RCMAIL->output->add_label('nopagesizewarning');
list($form_start, $form_end) = get_form_tags($attrib, 'save-prefs');
unset($attrib['form']);
$out = $form_start;
- $table = new html_table(array('cols' => 2));
-
- // show language selection
- if (!isset($no_override['language'])) {
- $a_lang = $RCMAIL->list_languages();
- asort($a_lang);
- $field_id = 'rcmfd_lang';
- $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
- $select_lang->add(array_values($a_lang), array_keys($a_lang));
+ foreach ($blocks as $part)
+ $out .= rcmail_user_prefs_block($part, $no_override, $attrib);
- $table->add('title', html::label($field_id, Q(rcube_label('language'))));
- $table->add(null, $select_lang->show($RCMAIL->user->language));
- }
-
+ return $out . $form_end;
+}
- // show page size selection
- if (!isset($no_override['timezone'])) {
- $field_id = 'rcmfd_timezone';
- $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
- $select_timezone->add(rcube_label('autodetect'), 'auto');
- $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
- $select_timezone->add('(GMT -10:00) Hawaii', '-10');
- $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
- $select_timezone->add('(GMT -9:00) Alaska', '-9');
- $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
- $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
- $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
- $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
- $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
- $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
- $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
- $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
- $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
- $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
- $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
- $select_timezone->add('(GMT +1:00) Central European Time', '1');
- $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
- $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
- $select_timezone->add('(GMT +3:30) Tehran', '3.5');
- $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
- $select_timezone->add('(GMT +4:30) Kabul', '4.5');
- $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
- $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
- $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
- $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
- $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
- $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
- $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
- $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
- $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
- $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
- $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
- $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
- $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
- $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
- $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
- $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
- $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
- $select_timezone->add('(GMT +14:00) Kiribati', '14');
+function rcmail_user_prefs_block($part, $no_override, $attrib)
+{
+ global $RCMAIL;
+ $config = $RCMAIL->config->all();
- $table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
- $table->add(null, $select_timezone->show((string)$config['timezone']));
- }
+ switch ($part)
+ {
+ // General UI settings
+ case 'general':
+ $table = new html_table(array('cols' => 2));
- // daylight savings
- if (!isset($no_override['dst_active'])) {
- $field_id = 'rcmfd_dst';
- $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
-
- $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
- $table->add(null, $input_dst->show($config['dst_active']));
- }
+ // show language selection
+ if (!isset($no_override['language'])) {
+ $a_lang = $RCMAIL->list_languages();
+ asort($a_lang);
- // MM: Show checkbox for toggling 'pretty dates'
- if (!isset($no_override['prettydate'])) {
- $field_id = 'rcmfd_prettydate';
- $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
+ $field_id = 'rcmfd_lang';
+ $select_lang = new html_select(array('name' => '_language', 'id' => $field_id));
+ $select_lang->add(array_values($a_lang), array_keys($a_lang));
- $table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
- $table->add(null, $input_prettydate->show($config['prettydate']?1:0));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('language'))));
+ $table->add(null, $select_lang->show($RCMAIL->user->language));
+ }
- // show page size selection
- if (!isset($no_override['pagesize'])) {
- $field_id = 'rcmfd_pgsize';
- $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
+ // show page size selection
+ if (!isset($no_override['timezone'])) {
+ $field_id = 'rcmfd_timezone';
+ $select_timezone = new html_select(array('name' => '_timezone', 'id' => $field_id, 'onchange' => "document.getElementById('rcmfd_dst').disabled=this.selectedIndex==0"));
+ $select_timezone->add(rcube_label('autodetect'), 'auto');
+ $select_timezone->add('(GMT -11:00) Midway Island, Samoa', '-11');
+ $select_timezone->add('(GMT -10:00) Hawaii', '-10');
+ $select_timezone->add('(GMT -9:30) Marquesas Islands', '-9.5');
+ $select_timezone->add('(GMT -9:00) Alaska', '-9');
+ $select_timezone->add('(GMT -8:00) Pacific Time (US/Canada)', '-8');
+ $select_timezone->add('(GMT -7:00) Mountain Time (US/Canada)', '-7');
+ $select_timezone->add('(GMT -6:00) Central Time (US/Canada), Mexico City', '-6');
+ $select_timezone->add('(GMT -5:00) Eastern Time (US/Canada), Bogota, Lima', '-5');
+ $select_timezone->add('(GMT -4:30) Caracas', '-4.5');
+ $select_timezone->add('(GMT -4:00) Atlantic Time (Canada), La Paz', '-4');
+ $select_timezone->add('(GMT -3:30) Nfld Time (Canada), Nfld, S. Labador', '-3.5');
+ $select_timezone->add('(GMT -3:00) Brazil, Buenos Aires, Georgetown', '-3');
+ $select_timezone->add('(GMT -2:00) Mid-Atlantic', '-2');
+ $select_timezone->add('(GMT -1:00) Azores, Cape Verde Islands', '-1');
+ $select_timezone->add('(GMT) Western Europe, London, Lisbon, Casablanca', '0');
+ $select_timezone->add('(GMT +1:00) Central European Time', '1');
+ $select_timezone->add('(GMT +2:00) EET: Kaliningrad, South Africa', '2');
+ $select_timezone->add('(GMT +3:00) Baghdad, Kuwait, Riyadh, Moscow, Nairobi', '3');
+ $select_timezone->add('(GMT +3:30) Tehran', '3.5');
+ $select_timezone->add('(GMT +4:00) Abu Dhabi, Muscat, Baku, Tbilisi', '4');
+ $select_timezone->add('(GMT +4:30) Kabul', '4.5');
+ $select_timezone->add('(GMT +5:00) Ekaterinburg, Islamabad, Karachi', '5');
+ $select_timezone->add('(GMT +5:30) Chennai, Kolkata, Mumbai, New Delhi', '5.5');
+ $select_timezone->add('(GMT +5:45) Kathmandu', '5.75');
+ $select_timezone->add('(GMT +6:00) Almaty, Dhaka, Colombo', '6');
+ $select_timezone->add('(GMT +6:30) Cocos Islands, Myanmar', '6.5');
+ $select_timezone->add('(GMT +7:00) Bangkok, Hanoi, Jakarta', '7');
+ $select_timezone->add('(GMT +8:00) Beijing, Perth, Singapore, Taipei', '8');
+ $select_timezone->add('(GMT +8:45) Caiguna, Eucla, Border Village', '8.75');
+ $select_timezone->add('(GMT +9:00) Tokyo, Seoul, Yakutsk', '9');
+ $select_timezone->add('(GMT +9:30) Adelaide, Darwin', '9.5');
+ $select_timezone->add('(GMT +10:00) EAST/AEST: Sydney, Guam, Vladivostok', '10');
+ $select_timezone->add('(GMT +10:30) New South Wales', '10.5');
+ $select_timezone->add('(GMT +11:00) Magadan, Solomon Islands', '11');
+ $select_timezone->add('(GMT +11:30) Norfolk Island', '11.5');
+ $select_timezone->add('(GMT +12:00) Auckland, Wellington, Kamchatka', '12');
+ $select_timezone->add('(GMT +12:45) Chatham Islands', '12.75');
+ $select_timezone->add('(GMT +13:00) Tonga, Pheonix Islands', '13');
+ $select_timezone->add('(GMT +14:00) Kiribati', '14');
+
+ $table->add('title', html::label($field_id, Q(rcube_label('timezone'))));
+ $table->add(null, $select_timezone->show((string)$config['timezone']));
+ }
- $table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
- $table->add(null, $input_pagesize->show($config['pagesize']));
- }
+ // daylight savings
+ if (!isset($no_override['dst_active'])) {
+ $field_id = 'rcmfd_dst';
+ $input_dst = new html_checkbox(array('name' => '_dst_active', 'id' => $field_id, 'value' => 1, 'disabled' => ($config['timezone'] === 'auto')));
- // show drop-down for available skins
- if (!isset($no_override['skin'])) {
- $skins = rcmail_get_skins();
+ $table->add('title', html::label($field_id, Q(rcube_label('dstactive'))));
+ $table->add(null, $input_dst->show($config['dst_active']));
+ }
- if (count($skins) > 1) {
- $field_id = 'rcmfd_skin';
- $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
-
- foreach($skins as $skin)
- $input_skin->add($skin, $skin);
+ // MM: Show checkbox for toggling 'pretty dates'
+ if (!isset($no_override['prettydate'])) {
+ $field_id = 'rcmfd_prettydate';
+ $input_prettydate = new html_checkbox(array('name' => '_pretty_date', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('skin'))));
- $table->add(null, $input_skin->show($config['skin']));
+ $table->add('title', html::label($field_id, Q(rcube_label('prettydate'))));
+ $table->add(null, $input_prettydate->show($config['prettydate']?1:0));
}
- }
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
-
- $table = new html_table(array('cols' => 2));
+ // show page size selection
+ if (!isset($no_override['pagesize'])) {
+ $field_id = 'rcmfd_pgsize';
+ $input_pagesize = new html_inputfield(array('name' => '_pagesize', 'id' => $field_id, 'size' => 5));
- if (!isset($no_override['focus_on_new_message'])) {
- $field_id = 'rcmfd_focus_on_new_message';
- $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
- $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('pagesize'))));
+ $table->add(null, $input_pagesize->show($config['pagesize']));
+ }
+
+ // show drop-down for available skins
+ if (!isset($no_override['skin'])) {
+ $skins = rcmail_get_skins();
+
+ if (count($skins) > 1) {
+ $field_id = 'rcmfd_skin';
+ $input_skin = new html_select(array('name'=>'_skin', 'id'=>$field_id));
+
+ foreach($skins as $skin)
+ $input_skin->add($skin, $skin);
- // show config parameter for preview pane
- if (!isset($no_override['preview_pane'])) {
- $field_id = 'rcmfd_preview';
- $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
+ $table->add('title', html::label($field_id, Q(rcube_label('skin'))));
+ $table->add(null, $input_skin->show($config['skin']));
+ }
+ }
- $table->add('title', html::label($field_id, Q(rcube_label('previewpane'))));
- $table->add(null, $input_preview->show($config['preview_pane']?1:0));
- }
+ if ($table->size())
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('uisettings'))) . $table->show($attrib));
+ break;
- if (!isset($no_override['mdn_requests'])) {
- $field_id = 'rcmfd_mdn_requests';
- $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
- $select_mdn_requests->add(rcube_label('askuser'), 0);
- $select_mdn_requests->add(rcube_label('autosend'), 1);
- $select_mdn_requests->add(rcube_label('ignore'), 2);
- $table->add('title', html::label($field_id, Q(rcube_label('mdnrequests'))));
- $table->add(null, $select_mdn_requests->show($config['mdn_requests']));
- }
+ // Mailbox view (mail screen)
+ case 'mailbox':
+ $table = new html_table(array('cols' => 2));
- if (!isset($no_override['keep_alive'])) {
- $field_id = 'rcmfd_keep_alive';
- $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));
+ if (!isset($no_override['focus_on_new_message'])) {
+ $field_id = 'rcmfd_focus_on_new_message';
+ $input_focus_on_new_message = new html_checkbox(array('name' => '_focus_on_new_message', 'id' => $field_id, 'value' => 1));
+ $table->add('title', html::label($field_id, Q(rcube_label('focusonnewmessage'))));
+ $table->add(null, $input_focus_on_new_message->show($config['focus_on_new_message']?1:0));
+ }
- foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
- if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60)
- && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
- $select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min);
- }
+ // show config parameter for preview pane
+ if (!isset($no_override['preview_pane'])) {
+ $field_id = 'rcmfd_preview';
+ $input_preview = new html_checkbox(array('name' => '_preview_pane', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('keepalive'))));
- $table->add(null, $select_keep_alive->show($config['keep_alive']/60));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('previewpane'))));
+ $table->add(null, $input_preview->show($config['preview_pane']?1:0));
+ }
- if (!isset($no_override['check_all_folders'])) {
- $field_id = 'rcmfd_check_all_folders';
- $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders'))));
- $table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
- }
+ if (!isset($no_override['mdn_requests'])) {
+ $field_id = 'rcmfd_mdn_requests';
+ $select_mdn_requests = new html_select(array('name' => '_mdn_requests', 'id' => $field_id));
+ $select_mdn_requests->add(rcube_label('askuser'), 0);
+ $select_mdn_requests->add(rcube_label('autosend'), 1);
+ $select_mdn_requests->add(rcube_label('ignore'), 2);
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib));
+ $table->add('title', html::label($field_id, Q(rcube_label('mdnrequests'))));
+ $table->add(null, $select_mdn_requests->show($config['mdn_requests']));
+ }
- $table = new html_table(array('cols' => 2));
+ if (!isset($no_override['keep_alive'])) {
+ $field_id = 'rcmfd_keep_alive';
+ $select_keep_alive = new html_select(array('name' => '_keep_alive', 'id' => $field_id));
- // show checkbox for HTML/plaintext messages
- if (!isset($no_override['prefer_html'])) {
- $field_id = 'rcmfd_htmlmsg';
- $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
- 'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));
+ foreach(array(1, 3, 5, 10, 15, 30, 60) as $min)
+ if((!$config['min_keep_alive'] || $config['min_keep_alive'] <= $min * 60)
+ && (!$config['session_lifetime'] || $config['session_lifetime'] > $min)) {
+ $select_keep_alive->add(rcube_label(array('name' => 'keepaliveevery', 'vars' => array('n' => $min))), $min);
+ }
- $table->add('title', html::label($field_id, Q(rcube_label('preferhtml'))));
- $table->add(null, $input_preferhtml->show($config['prefer_html']?1:0));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('keepalive'))));
+ $table->add(null, $select_keep_alive->show($config['keep_alive']/60));
+ }
- if (!isset($no_override['show_images'])) {
- $field_id = 'rcmfd_show_images';
- $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
- $input_show_images->add(rcube_label('never'), 0);
- $input_show_images->add(rcube_label('fromknownsenders'), 1);
- $input_show_images->add(rcube_label('always'), 2);
+ if (!isset($no_override['check_all_folders'])) {
+ $field_id = 'rcmfd_check_all_folders';
+ $input_check_all = new html_checkbox(array('name' => '_check_all_folders', 'id' => $field_id, 'value' => 1));
+ $table->add('title', html::label($field_id, Q(rcube_label('checkallfolders'))));
+ $table->add(null, $input_check_all->show($config['check_all_folders']?1:0));
+ }
- $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages'))));
- $table->add(null, $input_show_images->show($config['show_images']));
- }
+ if ($table->size())
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('mailboxview'))) . $table->show($attrib));
+ break;
- if (!isset($no_override['inline_images'])) {
- $field_id = 'rcmfd_inline_images';
- $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('showinlineimages'))));
- $table->add(null, $input_inline_images->show($config['inline_images']?1:0));
- }
+ // Message viewing
+ case 'mailview':
+ $table = new html_table(array('cols' => 2));
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib));
-
- $table = new html_table(array('cols' => 2));
+ // show checkbox for HTML/plaintext messages
+ if (!isset($no_override['prefer_html'])) {
+ $field_id = 'rcmfd_htmlmsg';
+ $input_preferhtml = new html_checkbox(array('name' => '_prefer_html', 'id' => $field_id, 'value' => 1,
+ 'onchange' => JS_OBJECT_NAME.'.toggle_prefer_html(this)'));
- // Show checkbox for HTML Editor
- if (!isset($no_override['htmleditor'])) {
- $field_id = 'rcmfd_htmleditor';
- $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
-
- $table->add('title', html::label($field_id, Q(rcube_label('htmleditor'))));
- $table->add(null, $input_htmleditor->show($config['htmleditor']?1:0));
- }
-
- if (!isset($no_override['draft_autosave'])) {
- $field_id = 'rcmfd_autosave';
- $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
- $select_autosave->add(rcube_label('never'), 0);
- foreach (array(3, 5, 10) as $i => $min)
- $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
-
- $table->add('title', html::label($field_id, Q(rcube_label('autosavedraft'))));
- $table->add(null, $select_autosave->show($config['draft_autosave']));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('preferhtml'))));
+ $table->add(null, $input_preferhtml->show($config['prefer_html']?1:0));
+ }
- if (!isset($no_override['mime_param_folding'])) {
- $field_id = 'rcmfd_param_folding';
- $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
- $select_param_folding->add(rcube_label('2231folding'), 0);
- $select_param_folding->add(rcube_label('miscfolding'), 1);
- $select_param_folding->add(rcube_label('2047folding'), 2);
+ if (!isset($no_override['show_images'])) {
+ $field_id = 'rcmfd_show_images';
+ $input_show_images = new html_select(array('name' => '_show_images', 'id' => $field_id));
+ $input_show_images->add(rcube_label('never'), 0);
+ $input_show_images->add(rcube_label('fromknownsenders'), 1);
+ $input_show_images->add(rcube_label('always'), 2);
- $table->set_row_attribs('advanced');
- $table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding'))));
- $table->add(null, $select_param_folding->show($config['mime_param_folding']));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('showremoteimages'))));
+ $table->add(null, $input_show_images->show($config['show_images']));
+ }
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
+ if (!isset($no_override['inline_images'])) {
+ $field_id = 'rcmfd_inline_images';
+ $input_inline_images = new html_checkbox(array('name' => '_inline_images', 'id' => $field_id, 'value' => 1));
- // Configure special folders
- if (!isset($no_override['default_imap_folders'])) {
- $RCMAIL->imap_init(true);
- $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
-
+ $table->add('title', html::label($field_id, Q(rcube_label('showinlineimages'))));
+ $table->add(null, $input_inline_images->show($config['inline_images']?1:0));
+ }
+
+ if ($table->size())
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagesdisplaying'))) . $table->show($attrib));
+ break;
+
+
+ // Mail composition
+ case 'compose':
$table = new html_table(array('cols' => 2));
- if (!isset($no_override['drafts_mbox'])) {
- $table->add('title', Q(rcube_label('drafts')));
- $table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0")));
+ // Show checkbox for HTML Editor
+ if (!isset($no_override['htmleditor'])) {
+ $field_id = 'rcmfd_htmleditor';
+ $input_htmleditor = new html_checkbox(array('name' => '_htmleditor', 'id' => $field_id, 'value' => 1));
+
+ $table->add('title', html::label($field_id, Q(rcube_label('htmleditor'))));
+ $table->add(null, $input_htmleditor->show($config['htmleditor']?1:0));
}
- if (!isset($no_override['sent_mbox'])) {
- $table->add('title', Q(rcube_label('sent')));
- $table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox")));
+ if (!isset($no_override['draft_autosave'])) {
+ $field_id = 'rcmfd_autosave';
+ $select_autosave = new html_select(array('name' => '_draft_autosave', 'id' => $field_id, 'disabled' => empty($config['drafts_mbox'])));
+ $select_autosave->add(rcube_label('never'), 0);
+ foreach (array(3, 5, 10) as $i => $min)
+ $select_autosave->add(rcube_label(array('name' => 'everynminutes', 'vars' => array('n' => $min))), $min*60);
+
+ $table->add('title', html::label($field_id, Q(rcube_label('autosavedraft'))));
+ $table->add(null, $select_autosave->show($config['draft_autosave']));
}
- if (!isset($no_override['junk_mbox'])) {
- $table->add('title', Q(rcube_label('junk')));
- $table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox")));
+ if (!isset($no_override['mime_param_folding'])) {
+ $field_id = 'rcmfd_param_folding';
+ $select_param_folding = new html_select(array('name' => '_mime_param_folding', 'id' => $field_id));
+ $select_param_folding->add(rcube_label('2231folding'), 0);
+ $select_param_folding->add(rcube_label('miscfolding'), 1);
+ $select_param_folding->add(rcube_label('2047folding'), 2);
+
+ $table->set_row_attribs('advanced');
+ $table->add('title', html::label($field_id, Q(rcube_label('mimeparamfolding'))));
+ $table->add(null, $select_param_folding->show($config['mime_param_folding']));
}
- if (!isset($no_override['trash_mbox'])) {
- $table->add('title', Q(rcube_label('trash')));
- $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox")));
+ if ($table->size())
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('messagescomposition'))) . $table->show($attrib));
+ break;
+
+
+ // Special IMAP folders
+ case 'folders':
+ // Configure special folders
+ if (!isset($no_override['default_imap_folders'])) {
+ $RCMAIL->imap_init(true);
+ $select = rcmail_mailbox_select(array('noselection' => '---', 'realnames' => true, 'maxlength' => 30));
+
+ $table = new html_table(array('cols' => 2));
+
+ if (!isset($no_override['drafts_mbox'])) {
+ $table->add('title', Q(rcube_label('drafts')));
+ $table->add(null, $select->show($config['drafts_mbox'], array('name' => "_drafts_mbox", 'onchange' => "document.getElementById('rcmfd_autosave').disabled=this.selectedIndex==0")));
+ }
+
+ if (!isset($no_override['sent_mbox'])) {
+ $table->add('title', Q(rcube_label('sent')));
+ $table->add(null, $select->show($config['sent_mbox'], array('name' => "_sent_mbox")));
+ }
+
+ if (!isset($no_override['junk_mbox'])) {
+ $table->add('title', Q(rcube_label('junk')));
+ $table->add(null, $select->show($config['junk_mbox'], array('name' => "_junk_mbox")));
+ }
+
+ if (!isset($no_override['trash_mbox'])) {
+ $table->add('title', Q(rcube_label('trash')));
+ $table->add(null, $select->show($config['trash_mbox'], array('name' => "_trash_mbox")));
+ }
+
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib));
}
+ break;
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('specialfolders'))) . $table->show($attrib));
- }
- $table = new html_table(array('cols' => 2));
+ // Server settings
+ case 'server':
+ $table = new html_table(array('cols' => 2));
- if (!isset($no_override['read_when_deleted'])) {
- $field_id = 'rcmfd_read_deleted';
- $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
-
- $table->add('title', html::label($field_id, Q(rcube_label('readwhendeleted'))));
- $table->add(null, $input_readdeleted->show($config['read_when_deleted']?1:0));
- }
+ if (!isset($no_override['read_when_deleted'])) {
+ $field_id = 'rcmfd_read_deleted';
+ $input_readdeleted = new html_checkbox(array('name' => '_read_when_deleted', 'id' => $field_id, 'value' => 1));
- if (!isset($no_override['flag_for_deletion'])) {
- $field_id = 'rcmfd_flag_for_deletion';
- $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
-
- $table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion'))));
- $table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0));
- }
-
- // don't show deleted messages
- if (!isset($no_override['skip_deleted'])) {
- $field_id = 'rcmfd_skip_deleted';
- $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
-
- $table->add('title', html::label($field_id, Q(rcube_label('skipdeleted'))));
- $table->add(null, $input_purge->show($config['skip_deleted']?1:0));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('readwhendeleted'))));
+ $table->add(null, $input_readdeleted->show($config['read_when_deleted']?1:0));
+ }
- // Trash purging on logout
- if (!isset($no_override['logout_purge'])) {
- $field_id = 'rcmfd_logout_purge';
- $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
-
- $table->add('title', html::label($field_id, Q(rcube_label('logoutclear'))));
- $table->add(null, $input_purge->show($config['logout_purge']?1:0));
- }
-
- // INBOX compacting on logout
- if (!isset($no_override['logout_expunge'])) {
- $field_id = 'rcmfd_logout_expunge';
- $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+ if (!isset($no_override['flag_for_deletion'])) {
+ $field_id = 'rcmfd_flag_for_deletion';
+ $input_flagfordeletion = new html_checkbox(array('name' => '_flag_for_deletion', 'id' => $field_id, 'value' => 1));
- $table->add('title', html::label($field_id, Q(rcube_label('logoutcompact'))));
- $table->add(null, $input_expunge->show($config['logout_expunge']?1:0));
- }
+ $table->add('title', html::label($field_id, Q(rcube_label('flagfordeletion'))));
+ $table->add(null, $input_flagfordeletion->show($config['flag_for_deletion']?1:0));
+ }
- $out .= html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('serversettings'))) . $table->show($attrib));
+ // don't show deleted messages
+ if (!isset($no_override['skip_deleted'])) {
+ $field_id = 'rcmfd_skip_deleted';
+ $input_purge = new html_checkbox(array('name' => '_skip_deleted', 'id' => $field_id, 'value' => 1));
+
+ $table->add('title', html::label($field_id, Q(rcube_label('skipdeleted'))));
+ $table->add(null, $input_purge->show($config['skip_deleted']?1:0));
+ }
+
+ // Trash purging on logout
+ if (!isset($no_override['logout_purge'])) {
+ $field_id = 'rcmfd_logout_purge';
+ $input_purge = new html_checkbox(array('name' => '_logout_purge', 'id' => $field_id, 'value' => 1));
+
+ $table->add('title', html::label($field_id, Q(rcube_label('logoutclear'))));
+ $table->add(null, $input_purge->show($config['logout_purge']?1:0));
+ }
+
+ // INBOX compacting on logout
+ if (!isset($no_override['logout_expunge'])) {
+ $field_id = 'rcmfd_logout_expunge';
+ $input_expunge = new html_checkbox(array('name' => '_logout_expunge', 'id' => $field_id, 'value' => 1));
+
+ $table->add('title', html::label($field_id, Q(rcube_label('logoutcompact'))));
+ $table->add(null, $input_expunge->show($config['logout_expunge']?1:0));
+ }
+
+ if ($table->size())
+ $out = html::tag('fieldset', null, html::tag('legend', null, Q(rcube_label('serversettings'))) . $table->show($attrib));
+ break;
- return $out . $form_end;
- }
+ default:
+ $out = '';
+ }
+
+ return $out;
+}
function rcmail_identities_list($attrib)
{
global $OUTPUT, $USER;
// add id to message list table if not specified
if (!strlen($attrib['id']))
$attrib['id'] = 'rcmIdentitiesList';
// define list of cols to be displayed
$a_show_cols = array('name', 'email');
// create XHTML table
$out = rcube_table_output($attrib, $USER->list_identities(), $a_show_cols, 'identity_id');
// set client env
$OUTPUT->add_gui_object('identitieslist', $attrib['id']);
return $out;
}
// similar function as in /steps/addressbook/edit.inc
function get_form_tags($attrib, $action, $add_hidden=array())
{
global $EDIT_FORM, $RCMAIL;
$form_start = '';
if (!strlen($EDIT_FORM))
{
$hiddenfields = new html_hiddenfield(array('name' => '_task', 'value' => $RCMAIL->task));
$hiddenfields->add(array('name' => '_action', 'value' => $action));
if ($add_hidden)
$hiddenfields->add($add_hidden);
$form_start = !strlen($attrib['form']) ? $RCMAIL->output->form_tag(array('name' => "form", 'method' => "post")) : '';
$form_start .= $hiddenfields->show();
}
$form_end = (!strlen($EDIT_FORM) && !strlen($attrib['form'])) ? '</form>' : '';
$form_name = strlen($attrib['form']) ? $attrib['form'] : 'form';
if (!strlen($EDIT_FORM))
$RCMAIL->output->add_gui_object('editform', $form_name);
$EDIT_FORM = $form_name;
return array($form_start, $form_end);
}
function rcmail_get_skins()
{
$path = 'skins';
$skins = array();
$dir = opendir($path);
if (!$dir)
return false;
while (($file = readdir($dir)) !== false)
{
$filename = $path.'/'.$file;
if (is_dir($filename) && is_readable($filename)
&& !in_array($file, array('.', '..', '.svn')))
$skins[] = $file;
}
closedir($dir);
return $skins;
}
function rcmail_get_email()
{
global $RCMAIL;
if (strpos($RCMAIL->user->data['username'], '@'))
return $RCMAIL->user->data['username'];
else {
if ($RCMAIL->config->get('virtuser_file'))
$user_email = rcube_user::user2email($RCMAIL->user->data['username']);
if ($user_email == '')
$user_email = sprintf('%s@%s', $RCMAIL->user->data['username'],
$RCMAIL->config->mail_domain($_SESSION['imap_host']));
return $user_email;
}
}
// register UI objects
$OUTPUT->add_handlers(array(
'userprefs' => 'rcmail_user_prefs_form',
'identitieslist' => 'rcmail_identities_list',
'itentitieslist' => 'rcmail_identities_list' // keep this for backward compatibility
));
?>
diff --git a/skins/default/settings.css b/skins/default/settings.css
index 2e181621c..59b847768 100644
--- a/skins/default/settings.css
+++ b/skins/default/settings.css
@@ -1,287 +1,287 @@
/***** RoundCube|Mail settings task styles *****/
#tabsbar
{
position: absolute;
top: 50px;
left: 220px;
right: 20px;
height: 22px;
border-bottom: 1px solid #999999;
white-space: nowrap;
/* css hack for IE */
width: expression((parseInt(document.documentElement.clientWidth)-240)+'px');
}
span.tablink,
span.tablink-selected
{
float: left;
width: 100px;
height: 24px !important;
height: 22px;
background: url('images/tab_pas.gif') top left no-repeat;
}
span.tablink-selected
{
background: url('images/tab_act.gif') top left no-repeat;
}
span.tablink a,
span.tablink-selected a
{
display: block;
padding-left: 10px;
padding-top: 5px;
color: #555555;
text-decoration: none;
}
span.tablink-selected a
{
color: #000000;
}
#userprefs-box
{
position: absolute;
top: 95px;
left: 20px;
bottom: 60px;
right: 20px;
overflow: auto;
border: 1px solid #999999;
/* css hack for IE */
height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
width: expression((parseInt(document.documentElement.clientWidth)-40)+'px');
}
-#userprefs-box fieldset
-{
- float: left;
- margin-right: 14px;
- width: 520px;
-}
-
#userprefs-box table td.title
{
color: #666666;
padding-right: 10px;
white-space: nowrap;
}
#userprefs-box table tr.advanced
{
display: none;
}
+.userprefs-block
+{
+ float: left;
+ margin-right: 14px;
+ width: 520px;
+}
+
#identities-list,
#folder-manager
{
position: absolute;
top: 95px;
left: 20px;
overflow: auto;
}
#folder-manager
{
width: 600px;
bottom: 140px;
overflow: auto;
border: 1px solid #999999;
/* css hack for IE */
height: expression((parseInt(document.documentElement.clientHeight)-235)+'px');
}
#folder-manager.droptarget
{
border: 1px solid #CC3333;
background-color: #FFFFA6;
}
#identities-list
{
bottom: 60px;
width: 420px;
border: 1px solid #999999;
/* css hack for IE */
height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
}
#listbuttons
{
position: absolute;
left: 20px;
bottom: 18px;
}
#identities-table
{
width: 420px;
table-layout: fixed;
background-color: #F9F9F9;
}
#identities-table tbody td
{
cursor: default;
overflow: hidden;
text-overflow: ellipsis;
}
#identities-table thead td.name
{
width: 55%;
}
#identities-table thead td.email
{
width: 45%;
}
#identity-frame
{
position: relative;
margin-top: 20px;
border: 1px solid #999999;
}
#identity-details
{
position: absolute;
top: 95px;
left: 450px;
right: 20px;
bottom: 60px;
border: 1px solid #999999;
overflow: auto;
/* css hack for IE */
width: expression((parseInt(document.documentElement.clientWidth)-470)+'px');
height: expression((parseInt(document.documentElement.clientHeight)-155)+'px');
}
#identity-details table td.title
{
color: #666666;
font-weight: bold;
text-align: right;
padding-right: 10px;
}
input.disabled
{
color: #999999;
}
#bottomboxes
{
position: absolute;
width: 600px;
height: 120px;
left: 20px;
bottom: 20px;
}
#userprefs-title,
#identity-title,
div.boxtitle,
#subscription-table thead td
{
height: 12px !important;
padding: 4px 20px 3px 6px;
border-bottom: 1px solid #999999;
color: #333333;
font-size: 11px;
font-weight: bold;
background-color: #EBEBEB;
background-image: url(images/listheader_aqua.gif);
}
div.settingsbox
{
width: 600px;
margin-top: 20px;
border: 1px solid #999999;
}
div.settingspart
{
display: block;
padding: 10px;
}
#subscription-table
{
width: 100%;
/* css hack for IE */
width: expression('auto');
}
#subscription-table tbody td
{
height: 20px;
padding-left: 6px;
padding-right: 10px;
white-space: nowrap;
border-bottom: 1px solid #EBEBEB;
background-color: #F9F9F9;
cursor: default;
}
#subscription-table tr.virtual td
{
color: #666;
}
#subscription-table tr.selected td,
#subscription-table tr.selected td a
{
color: #FFFFFF;
background-color: #CC3333;
}
#subscription-table tr.droptarget td,
#subscription-table tr.droptarget td a
{
background-color: #FFFFA6;
}
#subscription-table thead td.name
{
width: 250px;
}
#subscription-table thead td.msgcount
{
width: 90px;
}
#subscription-table thead td.subscribed
{
width: 90px;
}
fieldset
{
margin-bottom: 0.5em;
border: 1px solid #999999;
padding: 4px 8px 9px 8px;
}
legend
{
color: #999999;
}
div.advswitch
{
white-space: nowrap;
text-align: right;
position: absolute;
bottom: 35px;
right: 20px;
width: 460px;
}
diff --git a/skins/default/templates/settings.html b/skins/default/templates/settings.html
index c24a67b6e..a3f5298cd 100644
--- a/skins/default/templates/settings.html
+++ b/skins/default/templates/settings.html
@@ -1,34 +1,43 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title><roundcube:object name="pagetitle" /></title>
<roundcube:include file="/includes/links.html" />
<link rel="stylesheet" type="text/css" href="/settings.css" />
<script type="text/javascript" src="/functions.js"></script>
</head>
<body onload="rcube_init_settings_tabs()">
<roundcube:include file="/includes/taskbar.html" />
<roundcube:include file="/includes/header.html" />
<roundcube:include file="/includes/settingstabs.html" />
+<form name="form" action="./" method="post">
+
<div id="userprefs-box">
<div id="userprefs-title"><roundcube:label name="userpreferences" /></div>
<div style="padding:15px 0 15px 15px">
-<roundcube:object name="userprefs">
+<div class="userprefs-block">
+ <roundcube:object name="userprefs" form="form" parts="general,mailbox,mailview" />
+</div>
+<div class="userprefs-block">
+ <roundcube:object name="userprefs" form="form" parts="compose,folders,server" />
+</div>
<div style="clear:left"></div>
</div>
</div>
<p id="listbuttons">
<roundcube:button command="save" type="input" class="button mainaction" label="save" />
</p>
+</form>
+
<div class="advswitch">
<label for="advswitch"><roundcube:label name="advancedoptions"></label>
<input type="checkbox" id="advswitch" name="_advanced" value="0" onclick="rcube_show_advanced(this.checked)" />
</div>
</body>
</html>

File Metadata

Mime Type
text/x-diff
Expires
Sat, Mar 1, 12:06 PM (3 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
166951
Default Alt Text
(61 KB)

Event Timeline