From 73a5ec994a826d5bcbdb846e7c200dcd1873710d Mon Sep 17 00:00:00 2001
From: seek3r <seek3r@alumni.egroupware.org>
Date: Sat, 23 Dec 2000 09:43:04 +0000
Subject: [PATCH] added the security check to all vunerable files

---
 addressbook/preferences.php              | 1 -
 phpgwapi/inc/phpgw.inc.php               | 5 +++--
 phpgwapi/inc/phpgw_common.inc.php        | 5 +++--
 phpgwapi/inc/phpgw_info.inc.php          | 5 +++--
 setup/inc/functions.inc.php              | 7 +++++++
 setup/sql/common_default_records.inc.php | 7 +++++++
 setup/sql/common_main.inc.php            | 6 ++++++
 7 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/addressbook/preferences.php b/addressbook/preferences.php
index 50ed6bd11a..c36b275b44 100644
--- a/addressbook/preferences.php
+++ b/addressbook/preferences.php
@@ -10,7 +10,6 @@
   \**************************************************************************/
 
   /* $Id$ */
-
   $phpgw_info["flags"] = array("noheader" => True, 
                                "nonavbar" => True, 
                                "currentapp" => "addressbook", 
diff --git a/phpgwapi/inc/phpgw.inc.php b/phpgwapi/inc/phpgw.inc.php
index ede075b636..8fc3e5657e 100644
--- a/phpgwapi/inc/phpgw.inc.php
+++ b/phpgwapi/inc/phpgw.inc.php
@@ -14,10 +14,11 @@
   
   $d1 = strtolower(substr($phpgw_info["server"]["api_inc"],0,3));
   $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
-  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
+  $d3 = strtolower(substr($phpgw_info["server"]["app_inc"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
     echo "Failed attempt to break in via an old Security Hole!<br>\n";
     exit;
-  } unset($d1);unset($d2);
+  } unset($d1);unset($d2);unset($d3);
 
   error_reporting(7);
 
diff --git a/phpgwapi/inc/phpgw_common.inc.php b/phpgwapi/inc/phpgw_common.inc.php
index 23fcbbf6a4..7db2f90805 100644
--- a/phpgwapi/inc/phpgw_common.inc.php
+++ b/phpgwapi/inc/phpgw_common.inc.php
@@ -13,10 +13,11 @@
 
   $d1 = strtolower(substr($phpgw_info["server"]["api_inc"],0,3));
   $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
-  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
+  $d3 = strtolower(substr($phpgw_info["server"]["app_inc"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
     echo "Failed attempt to break in via an old Security Hole!<br>\n";
     exit;
-  } unset($d1);unset($d2);
+  } unset($d1);unset($d2);unset($d3);
   
   // Since LDAP will return system accounts, there are a few we don't want to login.
   $phpgw_info["server"]["global_denied_users"] = array('root'     => True,
diff --git a/phpgwapi/inc/phpgw_info.inc.php b/phpgwapi/inc/phpgw_info.inc.php
index 6437f1f037..dfed211265 100644
--- a/phpgwapi/inc/phpgw_info.inc.php
+++ b/phpgwapi/inc/phpgw_info.inc.php
@@ -14,10 +14,11 @@
 
   $d1 = strtolower(substr($phpgw_info["server"]["api_inc"],0,3));
   $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
-  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
+  $d3 = strtolower(substr($phpgw_info["server"]["app_inc"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
     echo "Failed attempt to break in via an old Security Hole!<br>\n";
     exit;
-  } unset($d1);unset($d2);
+  } unset($d1);unset($d2);unset($d3);
 
   magic_quotes_runtime(false);
 
diff --git a/setup/inc/functions.inc.php b/setup/inc/functions.inc.php
index ac89e5fe5d..b60161819e 100644
--- a/setup/inc/functions.inc.php
+++ b/setup/inc/functions.inc.php
@@ -10,6 +10,13 @@
   \**************************************************************************/
 
   /* $Id$ */
+  $d1 = strtolower(substr($phpgw_info["server"]["api_inc"],0,3));
+  $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
+  $d3 = strtolower(substr($phpgw_info["server"]["app_inc"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp" || $d3 == "htt" || $d3 == "ftp") {
+    echo "Failed attempt to break in via an old Security Hole!<br>\n";
+    exit;
+  } unset($d1);unset($d2);unset($d3);
 
   // Include to check user authorization against  the 
   // password in ../header.inc.php to protect all of the setup
diff --git a/setup/sql/common_default_records.inc.php b/setup/sql/common_default_records.inc.php
index 580e81c313..abbcf97c17 100644
--- a/setup/sql/common_default_records.inc.php
+++ b/setup/sql/common_default_records.inc.php
@@ -11,6 +11,13 @@
 
   /* $Id$ */
 
+  $d1 = strtolower(substr($phpgw_info["server"]["include_root"],0,3));
+  $d2 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" || $d2 == "htt" || $d2 == "ftp") {
+    echo "Failed attempt to break in via an old Security Hole!<br>\n";
+    exit;
+  } unset($d1);unset($d2);
+
   function add_default_server_config(){
     global $db, $phpgw_info, $currentver;
     $db->query("insert into config (config_name, config_value) values ('template_set', 'default')");
diff --git a/setup/sql/common_main.inc.php b/setup/sql/common_main.inc.php
index 5cc38906a7..123b832ecd 100644
--- a/setup/sql/common_main.inc.php
+++ b/setup/sql/common_main.inc.php
@@ -11,6 +11,12 @@
 
   /* $Id$ */
 
+  $d1 = strtolower(substr($phpgw_info["server"]["server_root"],0,3));
+  if($d1 == "htt" || $d1 == "ftp" ) {
+    echo "Failed attempt to break in via an old Security Hole!<br>\n";
+    exit;
+  } unset($d1);
+
   function update_version_table($tableschanged = True){
     global $currentver, $phpgw_info, $db, $tablechanges;
     if ($tableschanged == True){$tablechanges = True;}