From 73899662952a1ae91167c070d2a38136a0200c67 Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 21 Dec 2012 10:32:59 +0100
Subject: Add notes about new requirements of the new mysql database driver,
 add check in installer (#1488875)

---
 installer/check.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'installer/check.php')

diff --git a/installer/check.php b/installer/check.php
index d6c9f5c40..886200b84 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -130,7 +130,13 @@ foreach ($optional_php_exts as $name => $ext) {
 $prefix = (PHP_SHLIB_SUFFIX === 'dll') ? 'php_' : '';
 foreach ($RCI->supported_dbs as $database => $ext) {
     if (extension_loaded($ext)) {
-        $RCI->pass($database);
+        // MySQL driver requires PHP >= 5.3 (#1488875)
+        if ($ext == 'pdo_mysql' && version_compare(PHP_VERSION, '5.3.0', '<')) {
+            $RCI->fail($database, 'PHP >= 5.3 required');
+        }
+        else {
+            $RCI->pass($database);
+        }
     }
     else {
         $_ext = $ext_dir . '/' . $prefix . $ext . '.' . PHP_SHLIB_SUFFIX;
-- 
cgit v1.2.3


From 619c320c0ee9ca39d0fada9113133724cc2a11fe Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 10 Jan 2013 09:41:12 +0100
Subject: Avoid direct execution of installer includes (#1488895)

---
 installer/check.php  | 7 +++++++
 installer/config.php | 7 +++++++
 installer/test.php   | 7 +++++++
 3 files changed, 21 insertions(+)

(limited to 'installer/check.php')

diff --git a/installer/check.php b/installer/check.php
index 886200b84..14fc4f06e 100644
--- a/installer/check.php
+++ b/installer/check.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="get">
 <?php
 
diff --git a/installer/config.php b/installer/config.php
index 6897ffbba..d6846edc7 100644
--- a/installer/config.php
+++ b/installer/config.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php" method="post">
 <input type="hidden" name="_step" value="2" />
 <?php
diff --git a/installer/test.php b/installer/test.php
index e266bf05f..b118924e4 100644
--- a/installer/test.php
+++ b/installer/test.php
@@ -1,3 +1,10 @@
+<?php
+
+if (!class_exists('rcube_install') || !is_object($RCI)) {
+    die("Not allowed! Please open installer/index.php instead.");
+}
+
+?>
 <form action="index.php?_step=3" method="post">
 
 <h3>Check config files</h3>
-- 
cgit v1.2.3