holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prevent new categories from being created during dry-run

Browse Source
This commit is contained in:
Nathan Gray 2012-10-18 16:38:30 +00:00
parent ae77723140
commit 34f8f7db08
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
importexport/inc/class.importexport_helper_functions.inc.php
View File

@ -21,6 +21,11 @@ class importexport_helper_functions {
*/
const CACHE_EXPIRATION = 3600;
/**
* Make no changes (automatic category creation)
*/
public static $dry_run = false;
/**
* Files known to cause problems, and will be skipped in a plugin scan
* If you put appname => true, the whole app will be skipped.
@ -187,7 +192,7 @@ class importexport_helper_functions {
foreach ( $cat_names as $cat_name ) {
$cat_name = trim($cat_name);
if ( $cat_name == '' ) continue;
if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 ) {
if ( ( $cat_id = $cats->name2id( $cat_name ) ) == 0 && !self::$dry_run) {
$cat_id = $cats->add( array(
'name' => $cat_name,
'parent' => $parent,

5
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -97,6 +97,7 @@
{
// Set this so plugin doesn't do any data changes
$content['dry-run'] = true;
importexport_helper_functions::$dry_run = true;
$this->message .= '<b>' . lang('Import aborted').":</b><br />\n";
$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
}
@ -105,6 +106,10 @@
{
echo $this->preview($plugin, $file, $definition_obj);
}
else
{
importexport_helper_functions::$dry_run = false;
}
$count = $plugin->import($file, $definition_obj);
}
else