diff --git a/addressbook/export.php b/addressbook/export.php index 801a1b2f74..14be383bd7 100644 --- a/addressbook/export.php +++ b/addressbook/export.php @@ -32,19 +32,17 @@ $phpgw_info['flags']['enable_browser_class'] = True; include('../header.inc.php'); - $sep = SEP; - if (!$convert) { $t = new Template(PHPGW_APP_TPL); $t->set_file(array('export' => 'export.tpl')); - $dir_handle=opendir($phpgw_info['server']['app_root'].$sep.'export'); + $dir_handle=opendir(PHPGW_APP_ROOT . SEP . 'export'); $i=0; $myfilearray=''; while ($file = readdir($dir_handle)) { #echo ""; - if ((substr($file, 0, 1) != '.') && is_file($phpgw_info['server']['app_root'].$sep.'export'.$sep.$file) ) + if ((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_ROOT . SEP . 'export' . SEP . $file) ) { $myfilearray[$i] = $file; $i++; @@ -97,7 +95,7 @@ } else { - include ($phpgw_info['server']['app_root'].$sep.'export'.$sep.$conv_type); + include (PHPGW_APP_ROOT . SEP . 'export' . SEP . $conv_type); $buffer=array(); $this = new export_conv; diff --git a/addressbook/import.php b/addressbook/import.php index 0f83c167cf..8ff9f617e9 100644 --- a/addressbook/import.php +++ b/addressbook/import.php @@ -19,19 +19,17 @@ ); include('../header.inc.php'); - $sep = SEP; - if (!$convert) { $t = new Template(PHPGW_APP_TPL); $t->set_file(array('import' => 'import.tpl')); - $dir_handle=opendir($phpgw_info['server']['app_root'] . $sep . 'import'); + $dir_handle=opendir(PHPGW_APP_ROOT . SEP . 'import'); $i=0; $myfilearray=''; while ($file = readdir($dir_handle)) { //echo ""; - if ((substr($file, 0, 1) != '.') && is_file($phpgw_info['server']['app_root'] . $sep . 'import' . $sep . $file) ) + if ((substr($file, 0, 1) != '.') && is_file(PHPGW_APP_ROOT . SEP . 'import' . SEP . $file) ) { $myfilearray[$i] = $file; $i++; @@ -69,7 +67,7 @@ } else { - include ($phpgw_info['server']['app_root'] . $sep . 'import' . $sep . $conv_type); + include (PHPGW_APP_ROOT . SEP. 'import' . SEP . $conv_type); if ($private == '') { $private = 'public'; } $row=0;