SF.net SVN: postfixadmin:[640] trunk

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

Revision: 640
          http://postfixadmin.svn.sourceforge.net/postfixadmin/?rev=640&view=rev
Author:   christian_boltz
Date:     2009-04-22 11:31:53 +0000 (Wed, 22 Apr 2009)

Log Message:
-----------
login.php, index.php:
- removed the $CONF['configured'] = 'I_know_the_risk_of_not_deleting_setup.php' 
  developer hack (no longer needed since setup.php requires a password)
- this also makes index.php redirecting to login.php again (the old check tested
  for file_exists(setup.php)...)

common.php:
- removed a superfluous check for $CONF[setup_password] (see mailinglist for details)

config.inc.php:
- removed a small outdated comment

Modified Paths:
--------------
    trunk/common.php
    trunk/config.inc.php
    trunk/index.php
    trunk/login.php

Modified: trunk/common.php
===================================================================
--- trunk/common.php	2009-04-20 18:41:23 UTC (rev 639)
+++ trunk/common.php	2009-04-22 11:31:53 UTC (rev 640)
@@ -40,9 +40,6 @@
     if($CONF['configured'] == FALSE) {
         die("Please edit config.inc.php - change \$CONF['configured'] to true after setting your database settings");
     }
-    if(!isset($CONF['setup_password'])) {
-        die("You must have a \$CONF['setup_password'] defined - this allows authenticated access to setup.php");
-    }
 }
 
 

Modified: trunk/config.inc.php
===================================================================
--- trunk/config.inc.php	2009-04-20 18:41:23 UTC (rev 639)
+++ trunk/config.inc.php	2009-04-22 11:31:53 UTC (rev 640)
@@ -382,7 +382,7 @@
 // that future updates work without problems, you can use a separate config 
 // file (config.local.php) instead of editing this file and override some
 // settings there.
-if (file_exists(dirname(__FILE__) . '/config.local.php')) { # for /
+if (file_exists(dirname(__FILE__) . '/config.local.php')) {
     include(dirname(__FILE__) . '/config.local.php');
 }
 

Modified: trunk/index.php
===================================================================
--- trunk/index.php	2009-04-20 18:41:23 UTC (rev 639)
+++ trunk/index.php	2009-04-22 11:31:53 UTC (rev 640)
@@ -23,7 +23,7 @@
 
 $CONF['configured'] = FALSE;
 @include_once('config.inc.php'); # hide error message because only $CONF['configured'] is checked here
-if (!file_exists (realpath ("./setup.php")) || $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php')
+if ( $CONF['configured'] === TRUE )
 {
     header ("Location: login.php");
     exit;

Modified: trunk/login.php
===================================================================
--- trunk/login.php	2009-04-20 18:41:23 UTC (rev 639)
+++ trunk/login.php	2009-04-22 11:31:53 UTC (rev 640)
@@ -30,15 +30,10 @@
 
 require_once('common.php');
 
-if (isset($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php') {
+if($CONF['configured'] !== true) {
+  print "Installation not yet configured; please edit config.inc.php";
+  exit;
 }
-else
-{
-    if($CONF['configured'] !== true) {
-      print "Installation not yet configured; please edit config.inc.php";
-      exit;
-    }
-}
 
 if ($_SERVER['REQUEST_METHOD'] == "GET")
 {


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