check against own filename

This commit is contained in:
Ralf Becker 2007-12-12 02:21:00 +00:00
parent f7b93b3d10
commit f750f112f3

View File

@ -10,7 +10,7 @@
* @version $Id$ * @version $Id$
*/ */
if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') === false) if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
{ {
$GLOBALS['egw_info'] = array( $GLOBALS['egw_info'] = array(
'flags' => array( 'flags' => array(
@ -108,13 +108,15 @@
$GLOBALS['egw_setup']->db->delete($table,'1=1',__LINE__,__FILE__); $GLOBALS['egw_setup']->db->delete($table,'1=1',__LINE__,__FILE__);
} }
} }
echo "About to create Default group\n";
/* Create the demo groups */ /* Create the demo groups */
$defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False); $defaultgroupid = (int)$GLOBALS['egw_setup']->add_account('Default','Default','Group',False,False);
$admingroupid = (int)$GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False); $admingroupid = (int)$GLOBALS['egw_setup']->add_account('Admins','Admin','Group',False,False);
echo "Groups created\n";
if (!$defaultgroupid || !$admingroupid) if (!$defaultgroupid || !$admingroupid)
{ {
if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') !== false) if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
{ {
return 42; //lang('Error in group-creation !!!'); // dont exit on setup-cli return 42; //lang('Error in group-creation !!!'); // dont exit on setup-cli
} }
@ -201,7 +203,7 @@
$accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email); $accountid = $GLOBALS['egw_setup']->add_account($username,$fname,$lname,$passwd,'Admins',True,$email);
if (!$accountid) if (!$accountid)
{ {
if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') !== false) if (strpos($_SERVER['PHP_SELF'],'admin_account.php') === false)
{ {
return 41; //lang('Error in admin-creation !!!'); // dont exit on setup-cli return 41; //lang('Error in admin-creation !!!'); // dont exit on setup-cli
} }
@ -214,7 +216,7 @@
$GLOBALS['egw_setup']->db->transaction_commit(); $GLOBALS['egw_setup']->db->transaction_commit();
if (strpos($_SERVER['PHP_SELF'],'setup-cli.php') === false) if (strpos($_SERVER['PHP_SELF'],'admin_account.php') !== false)
{ {
Header('Location: index.php'); Header('Location: index.php');
} }