Dev: lost a switch .... oups

LimeSurvey · Oct 21, 2013 · 9da04f3 · 9da04f3
1 parent 087e350
commit 9da04f3
Showing 1 changed file with 37 additions and 34 deletions.
diff --git a/application/helpers/expressions/em_manager_helper.php b/application/helpers/expressions/em_manager_helper.php
@@ -1666,43 +1666,46 @@ public function _CreateSubQLevelRelevanceAndValidationEqns($onlyThisQseq=NULL)
                 // input_boxes
                 if (isset($qattr['input_boxes']) && $qattr['input_boxes'] == 1) {
                     $input_boxes=1;
-                    case ':': //Array Numbers
-                        if ($hasSubqs && isset($qattr['input_boxes']) && $qattr['input_boxes'] == 1) {
-                            $subqs = $qinfo['subqs'];
-                            $sq_equs=array();
-                            foreach($subqs as $sq)
-                            {
-                                $sq_name = ($this->sgqaNaming)?substr($sq['jsVarName'],4).".NAOK":$sq['varName'].".NAOK";
-                                if(($qinfo['mandatory']=='Y')){
-                                    $sq_equ = 'is_numeric('.$sq_name.')';
-                                }else{
-                                    $sq_equ = '( is_numeric('.$sq_name.') || is_empty('.$sq_name.') )';
+                    switch($type)
+                    {
+                        case ':': //Array Numbers
+                            if ($hasSubqs && isset($qattr['input_boxes']) && $qattr['input_boxes'] == 1) {
+                                $subqs = $qinfo['subqs'];
+                                $sq_equs=array();
+                                foreach($subqs as $sq)
+                                {
+                                    $sq_name = ($this->sgqaNaming)?substr($sq['jsVarName'],4).".NAOK":$sq['varName'].".NAOK";
+                                    if(($qinfo['mandatory']=='Y')){
+                                        $sq_equ = 'is_numeric('.$sq_name.')';
+                                    }else{
+                                        $sq_equ = '( is_numeric('.$sq_name.') || is_empty('.$sq_name.') )';
+                                    }
+                                    $subqValidSelector = $sq['jsVarName_on'];
+                                    if (!is_null($sq_name)) {
+                                        $sq_equs[] = $sq_equ;
+                                        $subqValidEqns[$subqValidSelector] = array(
+                                        'subqValidEqn' => $sq_equ,
+                                        'subqValidSelector' => $subqValidSelector,
+                                        );
+                                    }
                                 }
-                                $subqValidSelector = $sq['jsVarName_on'];
-                                if (!is_null($sq_name)) {
-                                    $sq_equs[] = $sq_equ;
-                                    $subqValidEqns[$subqValidSelector] = array(
-                                    'subqValidEqn' => $sq_equ,
-                                    'subqValidSelector' => $subqValidSelector,
-                                    );
+                                if (!isset($validationEqn[$questionNum]))
+                                {
+                                    $validationEqn[$questionNum] = array();
                                 }
+                                $validationEqn[$questionNum][] = array(
+                                'qtype' => $type,
+                                'type' => 'default',
+                                'class' => 'default',
+                                'eqn' =>  implode(' and ',$sq_equs),
+                                'qid' => $questionNum,
+                                'subqValidEqns' => $subqValidEqns,
+                                );
                             }
-                            if (!isset($validationEqn[$questionNum]))
-                            {
-                                $validationEqn[$questionNum] = array();
-                            }
-                            $validationEqn[$questionNum][] = array(
-                            'qtype' => $type,
-                            'type' => 'default',
-                            'class' => 'default',
-                            'eqn' =>  implode(' and ',$sq_equs),
-                            'qid' => $questionNum,
-                            'subqValidEqns' => $subqValidEqns,
-                            );
-                        }
-                        break;
-                    default:
-                        break;
+                            break;
+                        default:
+                            break;
+                    }
                 }else{
                     $input_boxes="";
                 }