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

A condition with a True action must have a False action. Pick 'none' if not specified

Browse Source
This commit is contained in:
Nathan Gray 2012-09-17 16:22:39 +00:00
parent b85e5d0889
commit 0fa73a76a1
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
importexport/inc/class.importexport_wizard_basic_import_csv.inc.php
View File

@ -366,10 +366,20 @@ class importexport_wizard_basic_import_csv
{ {
// Clear conditions that don't do anything // Clear conditions that don't do anything
foreach($content['conditions'] as $key => $condition) { foreach($content['conditions'] as $key => &$condition) {
if(($condition['true']['action'] == 'none' || !$condition['true']['action']) && !$condition['true']['stop'] if(($condition['true']['action'] == 'none' || !$condition['true']['action']) && !$condition['true']['stop']
&& ($condition['false']['action'] == 'none' || !$condition['false']['action']) && !$condition['false']['stop']) { && ($condition['false']['action'] == 'none' || !$condition['false']['action']) && !$condition['false']['stop']) {
unset($content['conditions'][$key]); unset($content['conditions'][$key]);
continue;
}
// Check for true without false, or false without true - set to 'none'
elseif($condition['true']['action'] == '' && $condition['false']['action'] != '' ||
$condition['true']['action'] != '' && $condition['false']['action'] == '' ||
!$condition['true'] || !$condition['false']
)
{
$condition[$condition['true']['action'] == '' ? 'true' : 'false']['action'] = "none";
} }
} }