From 330127a6123e45a96132910ddd991c37b2ed5953 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Sun, 2 Mar 2008 13:20:21 +0000
Subject: Disable PHP notices + check for installer script on login page

---
 index.php              | 13 ++++++++++++-
 installer/index.php    |  1 +
 installer/welcome.html | 11 ++++++++---
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index b72bed0a9..c5cd6ff42 100644
--- a/index.php
+++ b/index.php
@@ -2,7 +2,7 @@
 /*
  +-----------------------------------------------------------------------+
  | RoundCube Webmail IMAP Client                                         |
- | Version 0.1-20071210                                                  |
+ | Version 0.1-20080302                                                  |
  |                                                                       |
  | Copyright (C) 2005-2007, RoundCube Dev. - Switzerland                 |
  | Licensed under the GNU GPL                                            |
@@ -240,6 +240,17 @@ if (!empty($_action))
 // not logged in -> show login page
 if (empty($USER->ID))
 {
+  // check if installer is still active
+  if (is_file('./installer/index.php'))
+    $OUTPUT->add_footer('
+  <div style="background:#ef9398; border:2px solid #dc5757; padding:0.5em; margin:2em auto; width:50em">
+  <h2 style="margin-top:0.2em">Installer script is still accessible</h2>
+  <p>The install script of your RoundCube installation is still stored in its default location!</p>
+  <p>Please <b>remove</b> the whole <tt>installer</tt> folder from the RoundCube directory because
+  these files may expose sensitive configuration data like server passwords and encryption keys
+  to the public. Make sure you cannot access the <a href="./installer/">installer script</a> from your browser.</p>
+  </div>');
+  
   $OUTPUT->task = 'login';
   $OUTPUT->send('login');
   exit;
diff --git a/installer/index.php b/installer/index.php
index a5225eb54..264cefcca 100644
--- a/installer/index.php
+++ b/installer/index.php
@@ -26,6 +26,7 @@
 
 <?php
 
+  ini_set('error_reporting', E_ALL&~E_NOTICE);
   ini_set('display_errors', 1);
 
   $docroot = realpath(dirname(__FILE__) . '/../');
diff --git a/installer/welcome.html b/installer/welcome.html
index 62b60008c..a0c88e5e9 100644
--- a/installer/welcome.html
+++ b/installer/welcome.html
@@ -10,8 +10,12 @@
     <ul>
       <li>PCRE (perl compatible regular expression)</li>
       <li>Session support</li>
-      <li>libiconv (recommended)</li>
-      <li>mbstring (optional)</li>
+      <li>Sockets enabled</li>
+      <li>Libiconv (recommended)</li>
+      <li>OpenSSL (recommended)</li>
+      <li>FileInfo (optional)</li>
+      <li>Multibyte/mbstring (optional)</li>
+      <li>Mcrypt (optional)</li>
       </ul>
     </li>
     <li>php.ini options:
@@ -19,12 +23,13 @@
         <li>error_reporting E_ALL &amp; ~E_NOTICE (or lower)</li>
         <li>file_uploads on (for attachment upload features)</li>
         <li>session.auto_start needs to be off</li>
+        <li>magic_quotes_gpc off</li>
       </ul>
     </li>
     <li>A MySQL or PostgreSQL database engine or the SQLite extension for PHP</li>
     <li>An SMTP server (recommended) or PHP configured for mail delivery</li>
 </ul>
 
-<input type="submit" value="START" />
+<input type="submit" value="START INSTALLATION" />
 
 </form>
-- 
cgit v1.2.3