From ad61253c330d87008186b196a5bb7e30b1ff2ac8 Mon Sep 17 00:00:00 2001 From: David Goodwin Date: Wed, 8 Apr 2009 20:16:35 +0000 Subject: [PATCH] login.php: do not require the deletion of setup.php git-svn-id: https://svn.code.sf.net/p/postfixadmin/code/trunk@617 a1433add-5e2c-0410-b055-b7f2511e0802 --- login.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/login.php b/login.php index ce6f4446..6f453e11 100644 --- a/login.php +++ b/login.php @@ -30,14 +30,12 @@ require_once('common.php'); -# force user to delete setup.php (allows creation of superadmins!) -if (file_exists (realpath ("./setup.php"))) { - if (is_string($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php') - { - } - else - { - print "Please delete " . dirname(__FILE__) . "/setup.php before using Postfix Admin!"; +if (isset($CONF['configured']) && $CONF['configured'] == 'I_know_the_risk_of_not_deleting_setup.php') { +} +else +{ + if($CONF['configured'] !== true) { + print "Installation not yet configured; please edit config.inc.php"; exit; } }