Dev: Move query to model (getTotalQuestions)

LimeSurvey · Aug 30, 2016 · 6417eab · 6417eab
1 parent bf0a34d
commit 6417eab
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -1017,16 +1017,9 @@ function buildsurveysession($surveyid,$preview=false)
     // Always SetSurveyLanguage : surveys controller SetSurveyLanguage too, if different : broke survey (#09769)
     SetSurveyLanguage($surveyid, $language_to_set);
 
-
     UpdateGroupList($surveyid, $_SESSION['survey_'.$surveyid]['s_lang']);
 
-    $sQuery = "SELECT count(*)\n"
-    ." FROM {{groups}} INNER JOIN {{questions}} ON {{groups}}.gid = {{questions}}.gid\n"
-    ." WHERE {{questions}}.sid=".$surveyid."\n"
-    ." AND {{groups}}.language='".App()->getLanguage()."'\n"
-    ." AND {{questions}}.language='".App()->getLanguage()."'\n"
-    ." AND {{questions}}.parent_qid=0\n";
-    $totalquestions = Yii::app()->db->createCommand($sQuery)->queryScalar();
+    $totalquestions = Question::model()->getTotalQuestions($surveyid);
 
     $sQuery= "select count(*) from {{groups}}
         left join {{questions}} on  {{groups}}.gid={{questions}}.gid

diff --git a/application/models/Question.php b/application/models/Question.php
@@ -937,4 +937,20 @@ protected function beforeSave()
             return false;
         }
     }
+
+    /**
+     * Used in frontend helper, buildsurveysession.
+     * @param int $surveyid
+     * @return int
+     */
+    public static function getTotalQuestions($surveyid)
+    {
+        $sQuery = "SELECT count(*)\n"
+        ." FROM {{groups}} INNER JOIN {{questions}} ON {{groups}}.gid = {{questions}}.gid\n"
+        ." WHERE {{questions}}.sid=".$surveyid."\n"
+        ." AND {{groups}}.language='".App()->getLanguage()."'\n"
+        ." AND {{questions}}.language='".App()->getLanguage()."'\n"
+        ." AND {{questions}}.parent_qid=0\n";
+        return Yii::app()->db->createCommand($sQuery)->queryScalar();
+    }
 }