From ed60695cd5db8f06f7a3e46f40a8736d6465429e Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Fri, 11 Mar 2011 16:03:08 +0000 Subject: [PATCH] * fixed not working scheduled import from vfs --- importexport/inc/class.importexport_schedule_ui.inc.php | 7 ++++--- importexport/setup/setup.inc.php | 3 +++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/importexport/inc/class.importexport_schedule_ui.inc.php b/importexport/inc/class.importexport_schedule_ui.inc.php index 13c4853b97..e378e01851 100644 --- a/importexport/inc/class.importexport_schedule_ui.inc.php +++ b/importexport/inc/class.importexport_schedule_ui.inc.php @@ -248,12 +248,13 @@ stream_wrapper_register(vfs_stream_wrapper::SCHEME, 'vfs_stream_wrapper', STREAM_IS_URL); } - if ($data['type'] == 'import' && !is_readable($data['target'])) + if ($data['type'] == 'import' && ($scheme == egw_vfs::SCHEME && !egw_vfs::is_readable($data['target']) || + $scheme != egw_vfs::SCHEME && !is_readable($data['target']))) { - return $data['target']. ' is not readable'; + return lang('%1 is not readable',$data['target']); } elseif ($data['type'] == 'export' && !self::is__writable($data['target'])) { - return $data['target']. ' is not writable'; + return lang('%1 is not writable',$data['target']); } return true; diff --git a/importexport/setup/setup.inc.php b/importexport/setup/setup.inc.php index 6207345c4c..d0f20d031d 100644 --- a/importexport/setup/setup.inc.php +++ b/importexport/setup/setup.inc.php @@ -9,6 +9,9 @@ * @version $Id$ */ +// RB: never install by default, only via setup +$setup_info['importexport']['only_db'] = array('never'); + $setup_info['importexport']['name'] = 'importexport'; $setup_info['importexport']['version'] = '1.9.001'; $setup_info['importexport']['app_order'] = 2;