From 12c2293342165a6b08f3e493cc028d59680df23d Mon Sep 17 00:00:00 2001 From: Xavier Date: Thu, 12 Nov 2015 15:03:44 -0500 Subject: [PATCH 1/3] fix examiners list in intruments --- php/libraries/NDB_BVL_Instrument.class.inc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc index 8263e0ff78e..e041ef6af01 100644 --- a/php/libraries/NDB_BVL_Instrument.class.inc +++ b/php/libraries/NDB_BVL_Instrument.class.inc @@ -869,12 +869,13 @@ class NDB_BVL_Instrument extends NDB_Page $CertificationInstruments = array(); if ($CertificationEnabled) { - foreach ( - Utility::toArray($CertificationConfig['CertificationProjects']) - AS $key => $value - ) { - foreach ($value as $k=>$projID) { - $CertificationProjects[$projID] = $projID; + if (!empty($CertificationConfig['CertificationProjects'])) { + $ProjectList = $CertificationConfig['CertificationProjects']; + foreach ( + $ProjectList['CertificationProject'] + AS $key => $value + ) { + $CertificationProjects[$key] = $value; } } foreach ( From 443356fc59d2f87fc8e80a9563adac9e93db9c09 Mon Sep 17 00:00:00 2001 From: Xavier Date: Fri, 13 Nov 2015 09:51:34 -0500 Subject: [PATCH 2/3] Now work for both singgle and multi certification-project --- php/libraries/NDB_BVL_Instrument.class.inc | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc index e041ef6af01..0b332381470 100644 --- a/php/libraries/NDB_BVL_Instrument.class.inc +++ b/php/libraries/NDB_BVL_Instrument.class.inc @@ -869,13 +869,15 @@ class NDB_BVL_Instrument extends NDB_Page $CertificationInstruments = array(); if ($CertificationEnabled) { - if (!empty($CertificationConfig['CertificationProjects'])) { - $ProjectList = $CertificationConfig['CertificationProjects']; - foreach ( - $ProjectList['CertificationProject'] - AS $key => $value - ) { - $CertificationProjects[$key] = $value; + foreach ( + Utility::toArray($CertificationConfig['CertificationProjects']) + AS $key => $value + ) { + if(is_array($value['CertificationProject'])) { + $value = $value['CertificationProject']; + } + foreach ($value as $k=>$projID) { + $CertificationProjects[$projID] = $projID; } } foreach ( From 81e0a16add8af49823ec4d0e18e2e2641e39f076 Mon Sep 17 00:00:00 2001 From: Xavier Date: Fri, 13 Nov 2015 10:30:40 -0500 Subject: [PATCH 3/3] phpcs --- php/libraries/NDB_BVL_Instrument.class.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php/libraries/NDB_BVL_Instrument.class.inc b/php/libraries/NDB_BVL_Instrument.class.inc index 0b332381470..deb1e2efdcc 100644 --- a/php/libraries/NDB_BVL_Instrument.class.inc +++ b/php/libraries/NDB_BVL_Instrument.class.inc @@ -873,7 +873,7 @@ class NDB_BVL_Instrument extends NDB_Page Utility::toArray($CertificationConfig['CertificationProjects']) AS $key => $value ) { - if(is_array($value['CertificationProject'])) { + if (is_array($value['CertificationProject'])) { $value = $value['CertificationProject']; } foreach ($value as $k=>$projID) {