diff options
author | alecpl <alec@alec.pl> | 2011-12-29 09:35:01 +0000 |
---|---|---|
committer | alecpl <alec@alec.pl> | 2011-12-29 09:35:01 +0000 |
commit | 08ffd939a7530c44cd68b455f75175f79698073c (patch) | |
tree | ff3d5dcfef837d47e2a9b5873ef4a864f9da0e4a /installer | |
parent | 81c2ce9b7b670b05de21f5dcc4be50b70c12fcfc (diff) |
- Add separate pagesize setting for mail messages and contacts (#1488269)
Diffstat (limited to 'installer')
-rw-r--r-- | installer/config.php | 27 | ||||
-rw-r--r-- | installer/rcube_install.php | 7 |
2 files changed, 27 insertions, 7 deletions
diff --git a/installer/config.php b/installer/config.php index dabc478c9..b71e3d5d5 100644 --- a/installer/config.php +++ b/installer/config.php @@ -524,15 +524,34 @@ echo $input_skin->show($RCI->getprop('skin_logo')); <p class="hint">Enter a URL relative to the document root of this Roundcube installation.</p> </dd> -<dt class="propname">pagesize <span class="userconf">*</span></dt> +<dt class="propname">mail_pagesize <span class="userconf">*</span></dt> <dd> <?php -$input_pagesize = new html_inputfield(array('name' => '_pagesize', 'size' => 6, 'id' => "cfgpagesize")); -echo $input_pagesize->show($RCI->getprop('pagesize')); +$pagesize = $RCI->getprop('mail_pagesize'); +if (!$pagesize) { + $pagesize = $RCI->getprop('pagesize'); +} +$input_pagesize = new html_inputfield(array('name' => '_mail_pagesize', 'size' => 6, 'id' => "cfgmailpagesize")); +echo $input_pagesize->show($pagesize); + +?> +<div>Show up to X items in the mail messages list view.</div> +</dd> + +<dt class="propname">addressbook_pagesize <span class="userconf">*</span></dt> +<dd> +<?php + +$pagesize = $RCI->getprop('addressbook_pagesize'); +if (!$pagesize) { + $pagesize = $RCI->getprop('pagesize'); +} +$input_pagesize = new html_inputfield(array('name' => '_addressbook_pagesize', 'size' => 6, 'id' => "cfgabookpagesize")); +echo $input_pagesize->show($pagesize); ?> -<div>Show up to X items in list view.</div> +<div>Show up to X items in the contacts list view.</div> </dd> <dt class="propname">prefer_html <span class="userconf">*</span></dt> diff --git a/installer/rcube_install.php b/installer/rcube_install.php index 737972b93..a3618a515 100644 --- a/installer/rcube_install.php +++ b/installer/rcube_install.php @@ -40,14 +40,15 @@ class rcube_install 'multiple_identities' => 'identities_level', 'addrbook_show_images' => 'show_images', 'imap_root' => 'imap_ns_personal', + 'pagesize' => 'mail_pagesize', ); - + // these config options are required for a working system var $required_config = array( 'db_dsnw', 'db_table_contactgroups', 'db_table_contactgroupmembers', 'des_key', 'session_lifetime', ); - + /** * Constructor */ @@ -169,7 +170,7 @@ class rcube_install if (count($value) <= 1) $value = $value[0]; } - else if ($prop == 'pagesize') { + else if ($prop == 'mail_pagesize' || $prop == 'addressbook_pagesize') { $value = max(2, intval($value)); } else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) { |