HTTP_SERVER_SERVER should be HTTP_SERVER_VARS, but since
authorkink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 18 Feb 2007 12:46:47 +0000 (12:46 +0000)
committerkink <kink@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Sun, 18 Feb 2007 12:46:47 +0000 (12:46 +0000)
we require PHP >= 4.1.x, we need not use it anyware.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@12271 7612ce4b-ef26-0410-bec9-ea0150e637f0

15 files changed:
include/load_prefs.php
plugins/bug_report/functions.php
plugins/bug_report/system_specs.php
plugins/change_password/backend/ldap.php
plugins/filters/filters.php
plugins/translate/functions.php
themes/greenhouse_effect.php
themes/in_the_pink.php
themes/kind_of_blue.php
themes/monostochastic.php
themes/random.php
themes/shades_of_grey.php
themes/spice_of_life.php
themes/spice_of_life_dark.php
themes/spice_of_life_lite.php

index 12886b9fb5ba5feff87a94a08a7b303ae06b8fe5..cc73748bcce422edcd39c1acc56c1c5ce5180f54 100644 (file)
@@ -17,8 +17,7 @@
  * FIXME: PHP CGI (at least on IIS 5.1) does not set 'SCRIPT_FILENAME' and
  * code does not handle magic_quotes_gpc=on.
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../src/login.php");
     die();
 }
index e078dfb9999b54c53358b179b7054dd5ff81a84a..ba2c2f352863b4cf6b1da3ea582dac676e898066 100644 (file)
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../src/login.php");
     die();
 }
index d3fbe13563f9f6fe8b20d32feaec22c653263edf..7a209995fdd63cef95ab9088bf06dcc0a457206a 100644 (file)
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../src/login.php");
     die();
 }
index d7342d26c18b63e317b4940a5fbd5463f157f18f..93a4b0904fd8422458078fd0a57f3faf5149c693 100644 (file)
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../../src/login.php");
     die();
 }
index 995adf2e1ff4a43c6909e1cbf3c19f58d1a69e70..10b703d24c9eb6fdbb5ce4f3a1345990b7eb5dfc 100644 (file)
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../src/login.php");
     die();
 }
index 6df6fb015d4a5ed2274fbecbfd17e92f979467a8..cef56833aa65d4cceb107f382ee884781b1691d9 100644 (file)
@@ -13,8 +13,7 @@
 /**
  * do not allow to call this file directly
  */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-     (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     header("Location: ../../src/login.php");
     die();
 }
index c006b0ae81e50f5f23e488df9ee647d5fe870d01..a3f9b93197c88a60417c44360535278382315e3b 100755 (executable)
@@ -15,8 +15,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index 6a3ea45df6def509018db84da534f4e8e1a6e128..8d91e4e15c22ff3441151945a6609370e232b35c 100755 (executable)
@@ -16,8 +16,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index b83b67d97f1558c95bdbb81e1fcda2953b765662..12552f2e879b7bf0c423b1521d3e7c2a5223794b 100755 (executable)
@@ -16,8 +16,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index e38b51e03f853e144183ba7f786c492cf4ac2eec..952ea41c19a68abe1233b8085b0ea434e57eebd7 100755 (executable)
@@ -16,8 +16,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index 447a95bc7037ee0cd2b1b8a69aeb6401e988b081..2064b78d0701d4d3363645a2f5327ac22a559f3b 100755 (executable)
@@ -14,8 +14,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index 98e1dbfc258d9292f0f7ed464469bf8fcfccc0b8..50592acbf03ad915d57a7a56b762f09cda5e58a8 100755 (executable)
@@ -15,8 +15,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index 192b836799439b3c7fa3b4068208b588d5bf86b2..3be8549e913b9ee9c1ccce52f4dfa6a56e768c53 100755 (executable)
@@ -15,8 +15,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index 7e386f12f7aecd407ab21b2d8214b242fc1cfa34..dc14f2cd26968a3cc6906d2deed82acc7d28f1d1 100755 (executable)
@@ -15,8 +15,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }
 
index db5c3f3ea4efbe31f3261622f47b362fcc66e48c..ea520c15205cc97abe5e086f009c24c3b592d5c9 100755 (executable)
@@ -15,8 +15,7 @@
  */
 
 /** Prevent direct script loading */
-if ((isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) ||
-    (isset($HTTP_SERVER_SERVER['SCRIPT_FILENAME']) && $HTTP_SERVER_SERVER['SCRIPT_FILENAME'] == __FILE__) ) {
+if (isset($_SERVER['SCRIPT_FILENAME']) && $_SERVER['SCRIPT_FILENAME'] == __FILE__) {
     die();
 }