SF.net SVN: postfixadmin: [343] trunk/common.php

[<chr...@us...>]

Revision: 343
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=343&view=rev
Author:   christian_boltz
Date:     2008-04-25 13:35:55 -0700 (Fri, 25 Apr 2008)

Log Message:
-----------
common.php:
- common.php is indirectly included in setup.php (via upgrade.php),
  avoid endless redirect loop from setup.php to setup.php
  (just found some minutes ago, had blocker quality...)

Modified Paths:
--------------
    trunk/common.php

Modified: trunk/common.php
===================================================================
--- trunk/common.php	2008-04-23 15:54:48 UTC (rev 342)
+++ trunk/common.php	2008-04-25 20:35:55 UTC (rev 343)
@@ -28,9 +28,12 @@
     if(!is_file("$incpath/setup.php")) {
         die ("config.inc.php does not exist or is not configured correctly. Please re-install setup.php and create/fix your config.");
     } else {
-        header("Location: setup.php");    
-        exit(0);
-    }
+        # common.php is indirectly included in setup.php (via upgrade.php) - avoid endless redirect loop
+        if (!preg_match('/setup\.php$/', $_SERVER['SCRIPT_NAME'])) { 
+            header("Location: setup.php");
+            exit(0);
+        }
+     }
 }
 
 $incpath = dirname(__FILE__);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.