From 5845b2502787f6672e317bd271018e8cd778ec02 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')

diff --git a/installer/check.php b/installer/check.php
index 5cb30225e..514ec42a9 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 bd676b12e..41aa36e10 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 2dd330531..b8b60cf3d 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


From be6ef859781e5165da8ae8adec71b28aa8ba60f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 10 Jan 2013 09:41:30 +0100
Subject: Mark mime_magic option with old default value as obsolete

Conflicts:

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

(limited to 'installer')

diff --git a/installer/rcube_install.php b/installer/rcube_install.php
index 2688bd721..6c6555f91 100644
--- a/installer/rcube_install.php
+++ b/installer/rcube_install.php
@@ -251,7 +251,12 @@ class rcube_install
         $seen[$prop] = true;
       }
     }
-    
+
+    // the old default mime_magic reference is obsolete
+    if ($this->config['mime_magic'] == '/usr/share/misc/magic') {
+        $out['obsolete'][] = array('prop' => 'mime_magic', 'explain' => "Set value to null in order to use system default");
+    }
+
     // iterate over default config
     foreach ($defaults as $prop => $value) {
       if (!isset($seen[$prop]) && isset($required[$prop]) && !(is_bool($this->config[$prop]) || strlen($this->config[$prop])))
-- 
cgit v1.2.3