summaryrefslogtreecommitdiff
path: root/installer/rcube_install.php
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2008-04-16 09:42:54 +0000
committerthomascube <thomas@roundcube.net>2008-04-16 09:42:54 +0000
commitccb412f98252c66ad5ba9ea775d9bf34973697ab (patch)
treede06cc5cb71233c93feb771d4edc752988b439c8 /installer/rcube_install.php
parent33bb9826a76f9d6fabe343346a731925a42f0aa3 (diff)
Set minimum number of rows per page (#1484935)
Diffstat (limited to 'installer/rcube_install.php')
-rw-r--r--installer/rcube_install.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 12cd5c10d..c4704a3a8 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -102,7 +102,7 @@ class rcube_install
{
$value = $this->is_post && (isset($_POST["_$name"]) || $this->config_props[$name]) ? $_POST["_$name"] : $this->config[$name];
- if ($name == 'des_key' && !isset($_REQUEST["_$name"]))
+ if ($name == 'des_key' && !$this->configured && !isset($_REQUEST["_$name"]))
$value = rcube_install::random_key(24);
return $value !== null && $value !== '' ? $value : $default;
@@ -147,6 +147,9 @@ class rcube_install
if (count($value) <= 1)
$value = $value[0];
}
+ else if ($prop == 'pagesize') {
+ $value = max(2, intval($value));
+ }
else if ($prop == 'smtp_user' && !empty($_POST['_smtp_user_u'])) {
$value = '%u';
}