Permalink
Browse files

Some more bugfixes for the install script

  • Loading branch information...
1 parent 512d8c2 commit 1c4e5dd4d201b599094a40e908ebcaa6de40ac05 @thomascube thomascube committed Mar 3, 2008
Showing with 7 additions and 3 deletions.
  1. +1 −1 installer/check.php
  2. +5 −1 installer/config.php
  3. +1 −1 installer/rcube_install.php
View
@@ -31,7 +31,7 @@
'Mail_mime' => 'http://pear.php.net/package/Mail_mime'
);
-echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 2 : 3) . '" />';
+echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) . '" />';
?>
<h3>Checking PHP version</h3>
@@ -251,9 +251,13 @@
<?php
$text_imaphost = new textfield(array('name' => '_default_host[]', 'size' => 30));
+$default_hosts = $RCI->get_hostlist();
+
+if (empty($default_hosts))
+ $default_hosts = array('');
$i = 0;
-foreach ($RCI->get_hostlist() as $host) {
+foreach ($default_hosts as $host) {
echo '<div id="defaulthostentry'.$i.'">' . $text_imaphost->show($host);
if ($i++ > 0)
echo '<a href="#" onclick="removehostfield(this.parentNode);return false" class="removelink" title="Remove this entry">remove</a>';
@@ -79,7 +79,7 @@ function load_config()
*/
function _load_config($suffix)
{
- include '../config/main.inc' . $suffix;
+ @include '../config/main.inc' . $suffix;
if (is_array($rcmail_config)) {
$this->config += $rcmail_config;
}

0 comments on commit 1c4e5dd

Please sign in to comment.