SF.net SVN: postfixadmin:[733] trunk

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

Revision: 733
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=733&view=rev
Author:   christian_boltz
Date:     2009-10-20 19:25:20 +0000 (Tue, 20 Oct 2009)

Log Message:
-----------
setup.php:
- define('POSTFIXADMIN') to avoid session_start() call in common.php
  This avoids breakage if php5-session is not installed. Fixes
  https://sourceforge.net/tracker/?func=detail&aid=2855430&group_id=191583&atid=937964

common.php
- only define('POSTFIXADMIN') if it is not yet defined (avoids a warning)

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

Modified: trunk/common.php
===================================================================
--- trunk/common.php	2009-10-19 16:45:08 UTC (rev 732)
+++ trunk/common.php	2009-10-20 19:25:20 UTC (rev 733)
@@ -17,10 +17,10 @@
  * environment and ensures other functions are loaded.
  */
 
-if(!defined('POSTFIXADMIN')) {
+if(!defined('POSTFIXADMIN')) { # already defined if called from setup.php
     session_start();
+    define('POSTFIXADMIN', 1); # checked in included files
 }
-define('POSTFIXADMIN', 1); # checked in included files
 
 $incpath = dirname(__FILE__);
 (ini_get('magic_quotes_gpc') ? ini_set('magic_quotes_runtime', '0') : '1');

Modified: trunk/setup.php
===================================================================
--- trunk/setup.php	2009-10-19 16:45:08 UTC (rev 732)
+++ trunk/setup.php	2009-10-20 19:25:20 UTC (rev 733)
@@ -23,6 +23,8 @@
  * Form POST \ GET Variables: -none-
  */
 
+define('POSTFIXADMIN', 1); # by defining it here, common.php will not start a session.
+
 require_once('common.php');
 
 $CONF['show_header_text'] = 'NO';


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