Apply changes from trunk to 0.1-stable

6 files changed, 73 insertions, 30 deletions

diff --git a/installer/check.php b/installer/check.php
index 8352364f5..e671c06bd 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,7 +1,7 @@
 <form action="index.php" method="get">
 <?php
 
-$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session', 'Sockets' => 'sockets');
+$required_php_exts = array('PCRE' => 'pcre', 'Session' => 'session');
 
 $optional_php_exts = array('FileInfo' => 'fileinfo', 'Libiconv' => 'iconv',
     'Multibyte' => 'mbstring', 'OpenSSL' => 'openssl', 'Mcrypt' => 'mcrypt', 'GD' => 'gd');
@@ -37,13 +37,13 @@ echo '<input type="hidden" name="_step" value="' . ($RCI->configured ? 3 : 2) .
 <h3>Checking PHP version</h3>
 <?php
 
-if (phpversion() > 4.3) {
-    $RCI->pass('Version', 'PHP ' . phpversion() . ' detected');
+define('MIN_PHP_VERSION', '4.3.1');
+if (version_compare(PHP_VERSION, MIN_PHP_VERSION, '>=')) {
+    $RCI->pass('Version', 'PHP ' . PHP_VERSION . ' detected');
 }
 else {
-    $RCI->fail('Version', 'PHP Version 4.3.1 or greater is required');
+    $RCI->fail('Version', 'PHP Version ' . MIN_PHP_VERSION . ' or greater is required ' . PHP_VERSION . ' detected');
 }
-
 ?>
 
 <h3>Checking PHP extensions</h3>
@@ -65,7 +65,7 @@ foreach ($required_php_exts AS $name => $ext) {
 
 ?>
 
-<p class="hint">These extensions are <em>optional</em> but recommended to get the best performance:</p>
+<p class="hint">The next couple of extensions are <em>optional</em> but recommended to get the best performance:</p>
 <?php
 
 foreach ($optional_php_exts AS $name => $ext) {
diff --git a/installer/config.php b/installer/config.php
index 5b365a5a5..dc85faa6c 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -20,10 +20,14 @@ $RCI->config_props = array(
   'htmleditor' => 1,
 );
 
+// allow the current user to get to the next step
+$_SESSION['allowinstaller'] = true;
+
 if (!empty($_POST['submit'])) {
   
   echo '<p class="notice">Copy the following configurations and save them in two files (names above the text box)';
-  echo ' within the <tt>config/</tt> directory of your RoundCube installation.</p>';
+  echo ' within the <tt>config/</tt> directory of your RoundCube installation.<br/>';
+  echo ' Make sure that there are no characters outside the <tt>&lt;?php ?&gt;</tt> brackets when saving the files.</p>';
   
   $textbox = new textarea(array('rows' => 16, 'cols' => 60, 'class' => "configfile"));
   
diff --git a/installer/index.php b/installer/index.php
index 264cefcca..69e33f870 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -22,12 +22,11 @@
 
 <div id="content">
 
-<h1>RoundCube Webmail Installer</h1>
-
 <?php
-
   ini_set('error_reporting', E_ALL&~E_NOTICE);
   ini_set('display_errors', 1);
+  
+  session_start();
 
   $docroot = realpath(dirname(__FILE__) . '/../');
   $include_path  = $docroot . '/program/lib' . PATH_SEPARATOR . $docroot . '/program' . PATH_SEPARATOR . ini_get('include_path');
@@ -36,9 +35,20 @@
   require_once 'rcube_install.php';
   $RCI = rcube_install::get_instance();
   $RCI->load_config();
+
+  // exit if installation is complete
+  if ($RCI->configured && !$RCI->getprop('enable_installer') && !$_SESSION['allowinstaller']) {
+    header("HTTP/1.0 404 Not Found");
+    echo '<h2 class="error">The installer is disabled!</h2>';
+    echo '<p>To enable it again, set <tt>$rcmail_config[\'enable_installer\'] = true;</tt> in config/main.inc.php</p>';
+    echo '</div></body></html>';
+    exit;
+  }
   
 ?>
 
+<h1>RoundCube Webmail Installer</h1>
+
 <ol id="progress">
 <?php
   
@@ -51,7 +61,6 @@
 </ol>
 
 <?php
-
 $include_steps = array('welcome.html', 'check.php', 'config.php', 'test.php');
 
 if ($include_steps[$RCI->step]) {
diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 8caa79d02..12cd5c10d 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -171,7 +171,7 @@ class rcube_install
         $out);
     }
     
-    return $out;
+    return trim($out);
   }
   
   
@@ -305,6 +305,8 @@ class rcube_install
         if (eregi(';$', trim($line))) {
           $DB->query($buff);
           $buff = '';
+          if ($this->get_error())
+            break;
         }
       }
     }
diff --git a/installer/test.php b/installer/test.php
index 7e9903991..5be343a31 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -31,11 +31,38 @@ else if (!$read_db) {
 
 ?>
 
+<h3>Check if directories are writable</h3>
+<p>RoundCube may need to write/save files into these directories</p>
+<?php
+
+if ($RCI->configured) {
+    $pass = false;
+    foreach (array($RCI->config['temp_dir'],$RCI->config['log_dir']) as $dir) {
+        $dirpath = $dir{0} == '/' ? $dir : $docroot . '/' . $dir;
+        if (is_writable(realpath($dirpath))) {
+            $RCI->pass($dir);
+            $pass = true;
+        }
+        else {
+            $RCI->fail($dir, 'not writeable for the webserver');
+        }
+        echo '<br />';
+    }
+    
+    if (!$pass)
+        echo '<p class="hint">Use <tt>chmod</tt> or <tt>chown</tt> to grant write privileges to the webserver</p>';
+}
+else {
+    $RCI->fail('Config', 'Could not read config files');
+}
+
+?>
+
 <h3>Check configured database settings</h3>
 <?php
 
 $db_working = false;
-if (!empty($RCI->config)) {
+if ($RCI->configured) {
     if (!empty($RCI->config['db_backend']) && !empty($RCI->config['db_dsnw'])) {
 
         echo 'Backend: ';
@@ -53,7 +80,7 @@ if (!empty($RCI->config)) {
         }
         else {
             $RCI->fail('DSN (write)', $db_error_msg);
-            echo '<p class="hint">Make sure that the configured database extists and that the user as write privileges<br />';
+            echo '<p class="hint">Make sure that the configured database exists and that the user has write privileges<br />';
             echo 'DSN: ' . $RCI->config['db_dsnw'] . '</p>';
             if ($RCI->config['db_backend'] == 'mdb2')
               echo '<p class="hint">There are known problems with MDB2 running on PHP 4. Try setting <tt>db_backend</tt> to \'db\' instead</p>';
@@ -93,12 +120,12 @@ if ($db_working) {
 // more database tests
 if ($db_working) {
     // write test
-    $db_write = $DB->query("INSERT INTO {$RCI->config['db_table_cache']} (session_id, cache_key, data, user_id) VALUES (?, ?, ?, 0)", '1234567890abcdef', 'test', 'test');
-    $insert_id = $DB->insert_id($RCI->config['db_sequence_cache']);
-    
-    if ($db_write && $insert_id) {
+    $insert_id = md5(uniqid());
+    $db_write = $DB->query("INSERT INTO {$RCI->config['db_table_session']} (sess_id, created, ip, vars) VALUES (?, ".$DB->now().", '127.0.0.1', 'foo')", $insert_id);
+
+    if ($db_write) {
       $RCI->pass('DB Write');
-      $DB->query("DELETE FROM {$RCI->config['db_table_cache']} WHERE cache_id=?", $insert_id);
+      $DB->query("DELETE FROM {$RCI->config['db_table_session']} WHERE sess_id=?", $insert_id);
     }
     else {
       $RCI->fail('DB Write', $RCI->get_error());
@@ -137,11 +164,11 @@ if ($RCI->getprop('smtp_server')) {
   $pass = $RCI->getprop('smtp_pass', '(none)');
   
   if ($user == '%u') {
-    $user_field = new textfield(array('name' => '_user'));
-    $user = $user_field->show($_POST['_user']);
+    $user_field = new textfield(array('name' => '_smtp_user'));
+    $user = $user_field->show($_POST['_smtp_user']);
   }
   if ($pass == '%p') {
-    $pass_field = new passwordfield(array('name' => '_pass'));
+    $pass_field = new passwordfield(array('name' => '_smtp_pass'));
     $pass = $pass_field->show();
   }
   
@@ -168,8 +195,8 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
       preg_match('/^' . $RCI->email_pattern . '$/i', trim($_POST['_to']))) {
   
     $headers = array(
-      'From' => trim($_POST['_from']),
-      'To'  => trim($_POST['_to']),
+      'From'    => trim($_POST['_from']),
+      'To'      => trim($_POST['_to']),
       'Subject' => 'Test message from RoundCube',
     );
 
@@ -180,11 +207,13 @@ if (isset($_POST['sendmail']) && !empty($_POST['_from']) && !empty($_POST['_to']
     if ($RCI->getprop('smtp_server')) {
       $CONFIG = $RCI->config;
       
-      if (!empty($_POST['_user']))
-        $CONFIG['smtp_user'] = $_POST['_user'];
-      if (!empty($_POST['_pass']))
-        $CONFIG['smtp_pass'] = $_POST['_pass'];
-      
+      if (!empty($_POST['_smtp_user'])) {
+        $CONFIG['smtp_user'] = $_POST['_smtp_user'];
+      }
+      if (!empty($_POST['_smtp_pass'])) {
+        $CONFIG['smtp_pass'] = $_POST['_smtp_pass'];
+      }
+
       $mail_object  = new rc_mail_mime();
       $send_headers = $mail_object->headers($headers);
       
diff --git a/installer/welcome.html b/installer/welcome.html
index a0c88e5e9..200f680f3 100644
--- a/installer/welcome.html
+++ b/installer/welcome.html
@@ -10,7 +10,6 @@
     <ul>
       <li>PCRE (perl compatible regular expression)</li>
       <li>Session support</li>
-      <li>Sockets enabled</li>
       <li>Libiconv (recommended)</li>
       <li>OpenSSL (recommended)</li>
       <li>FileInfo (optional)</li>