From 56cf2915ccf702ec3dc24848b1cf2fa047d0bc3e Mon Sep 17 00:00:00 2001 From: Carsten Schmitz Date: Sun, 1 Apr 2007 18:17:22 +0000 Subject: [PATCH] Fixed some warnings on activation git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/phpsurveyor@2672 b72ed6b6-b9f8-46b5-92b4-906544132732 --- admin/activate.php | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/admin/activate.php b/admin/activate.php index 0fa40751e55..202620b8046 100644 --- a/admin/activate.php +++ b/admin/activate.php @@ -178,18 +178,24 @@ } //CHECK THAT ALL THE CREATED FIELDS WILL BE UNIQUE $fieldmap=createFieldMap($surveyid, "full"); - foreach($fieldmap as $fielddata) + if (isset($fieldmap)) { - $fieldlist[]=$fielddata['fieldname']; + foreach($fieldmap as $fielddata) + { + $fieldlist[]=$fielddata['fieldname']; + } + $fieldlist=array_reverse($fieldlist); //let's always change the later duplicate, not the earlier one } - $fieldlist=array_reverse($fieldlist); //let's always change the later duplicate, not the earlier one $checkKeysUniqueComparison = create_function('$value','if ($value > 1) return true;'); - $duplicates = array_keys (array_filter (array_count_values($fieldlist), $checkKeysUniqueComparison)); - foreach ($duplicates as $dup) + @$duplicates = array_keys (array_filter (array_count_values($fieldlist), $checkKeysUniqueComparison)); + if (isset($duplicates)) { - $badquestion=arraySearchByKey($dup, $fieldmap, "fieldname", 1); - $fix = "[Click Here to Fix]"; - $failedcheck[]=array($badquestion['qid'], $badquestion['question'], ": Bad duplicate fieldname $fix", $badquestion['gid']); + foreach ($duplicates as $dup) + { + $badquestion=arraySearchByKey($dup, $fieldmap, "fieldname", 1); + $fix = "[Click Here to Fix]"; + $failedcheck[]=array($badquestion['qid'], $badquestion['question'], ": Bad duplicate fieldname $fix", $badquestion['gid']); + } } //IF ANY OF THE CHECKS FAILED, PRESENT THIS SCREEN