From 6c1eb9f114a2a839f576dd24cfd7438ab358a875 Mon Sep 17 00:00:00 2001 From: Miles Lott Date: Wed, 12 Sep 2001 16:49:41 +0000 Subject: [PATCH] formatting --- setup/config.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/setup/config.php b/setup/config.php index 8caef1c2d0..f8e65346a4 100644 --- a/setup/config.php +++ b/setup/config.php @@ -14,7 +14,7 @@ $phpgw_info['flags'] = array( 'noheader' => True, 'nonavbar' => True, - 'currentapp' => "home", + 'currentapp' => 'home', 'noapi' => True ); include('./inc/functions.inc.php'); @@ -42,14 +42,14 @@ $phpgw_setup->loaddb(); /* Guessing default paths. */ - $current_config['files_dir'] = ereg_replace("/setup","/files",dirname($SCRIPT_FILENAME)); + $GLOBALS['current_config']['files_dir'] = ereg_replace('/setup','/files',dirname($SCRIPT_FILENAME)); if (is_dir('/tmp')) { - $current_config['temp_dir'] = '/tmp'; + $GLOBALS['current_config']['temp_dir'] = '/tmp'; } else { - $current_config['temp_dir'] = '/path/to/temp/dir'; + $GLOBALS['current_config']['temp_dir'] = '/path/to/temp/dir'; } if ($HTTP_POST_VARS['cancel']) @@ -124,12 +124,12 @@ @$phpgw_setup->db->query("SELECT * FROM $configtbl"); while (@$phpgw_setup->db->next_record()) { - $current_config[$phpgw_setup->db->f('config_name')] = $phpgw_setup->db->f('config_value'); + $GLOBALS['current_config'][$phpgw_setup->db->f('config_name')] = $phpgw_setup->db->f('config_value'); } - if ($current_config['files_dir'] == '/path/to/dir/phpgroupware/files') + if ($GLOBALS['current_config']['files_dir'] == '/path/to/dir/phpgroupware/files') { - $current_config['files_dir'] = $phpgw_info['server']['server_root'] . '/files'; + $GLOBALS['current_config']['files_dir'] = $phpgw_info['server']['server_root'] . '/files'; } if ($error == 'badldapconnection')