Merge branch '2.05' of github.com:LimeSurvey/LimeSurvey into 2.05

application/controllers/Statistics_userController.php

@@ -395,7 +395,7 @@ function actionAction($surveyid,$language)
 
 
 		// 1: Get list of questions with answers chosen
-		//"Getting Questions and Answers ..." is shown above the bar
+		//"Getting Questions and Answer ..." is shown above the bar
 		$prb->setLabelValue('txt1',$clang->gT('Getting questions and answers ...'));
 		$prb->moveStep(5);
 

application/controllers/admin/assessments.php

@@ -116,7 +116,7 @@ private function _showAssessments($iSurveyID, $action, $surveyLanguage, Limesurv
     private function _collectGroupData($iSurveyID)
     {
         $aData = array();
-        $groups = Groups::model()->findAllByAttributes(array('sid' => $iSurveyID));
+        $groups = QuestionGroup::model()->findAllByAttributes(array('sid' => $iSurveyID));
         foreach ($groups as $group) {
             $groupId = $group->attributes['gid'];
             $groupName = $group->attributes['group_name'];

application/controllers/admin/authentication.php

@@ -76,7 +76,7 @@ public function index()
             // Now authenticate
             if ($identity->authenticate()) 
             {
-                Failed_login_attempts::model()->deleteAttempts();
+                FailedLoginAttempt::model()->deleteAttempts();
 
                 $this->getController()->_GetSessionUserRights(Yii::app()->session['loginID']);
                 Yii::app()->session['just_logged_in'] = true;
@@ -233,7 +233,7 @@ private function _redirectIfLoggedIn()
     */
     private function _userCanLogin()
     {
-        $failed_login_attempts = Failed_login_attempts::model();
+        $failed_login_attempts = FailedLoginAttempt::model();
         $failed_login_attempts->cleanOutOldAttempts();
 
         if ($failed_login_attempts->isLockedOut())

application/controllers/admin/dataentry.php

@@ -536,7 +536,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
 
 
             // Perform a case insensitive natural sort on group name then question title of a multidimensional array
-            // $fnames = (Field Name in Survey Table, Short Title of Question, Question Type, Field Name, Question Code, Predetermined Answers if exist)
+            // $fnames = (Field Name in Survey Table, Short Title of Question, Question Type, Field Name, Question Code, Predetermined Answer if exist)
 
             $fnames['completed'] = array('fieldname'=>"completed", 'question'=>$clang->gT("Completed"), 'type'=>'completed');
 
@@ -565,7 +565,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                     $password = Yii::app()->request->getParam('accesscode');
                 }
 
-                $svresult= Saved_control::model()->findAllByAttributes(
+                $svresult= SavedControl::model()->findAllByAttributes(
                 array(
                 'sid' => $surveyid,
                 'identifier' => Yii::app()->request->getParam('identifier'),
@@ -579,7 +579,7 @@ public function editdata($subaction, $id, $surveyid, $language='')
                     $saver['ip'] = $svrow['ip'];
                 }
 
-                $svresult = Saved_control::model()->findAllByAttributes(array('scid'=>$saver['scid']));
+                $svresult = SavedControl::model()->findAllByAttributes(array('scid'=>$saver['scid']));
                 foreach($svresult as $svrow)
                 {
                     $responses[$svrow['fieldname']] = $svrow['value'];
@@ -1973,7 +1973,7 @@ public function view($surveyid, $lang=NULL)
                     // TODO - can questions be hidden?  Are JavaScript variables names used?  Consistently with everywhere else?
                     //                    LimeExpressionManager::ProcessRelevance($qidattributes['relevance'],$deqrow['qid'],NULL,$deqrow['type'],$hidden);
 
-                    // TMSW Conditions->Relevance:  Show relevance equation instead of conditions here - better yet, have data entry use survey-at-a-time but with different view
+                    // TMSW Condition->Relevance:  Show relevance equation instead of conditions here - better yet, have data entry use survey-at-a-time but with different view
 
                     $qinfo = LimeExpressionManager::GetQuestionStatus($deqrow['qid']);
                     $relevance = trim($qinfo['info']['relevance']);
@@ -2429,14 +2429,14 @@ private function _array_filter_help($qidattributes, $surveyprintlang, $surveyid)
         $output = "";
         if(!empty($qidattributes['array_filter']))
         {
-            $newquestiontext = Questions::model()->findByAttributes(array('title' => $qidattributes['array_filter'], 'language' => $surveyprintlang, 'sid' => $surveyid))->getAttribute('question');
+            $newquestiontext = Question::model()->findByAttributes(array('title' => $qidattributes['array_filter'], 'language' => $surveyprintlang, 'sid' => $surveyid))->getAttribute('question');
             $output .= "\n<p class='extrahelp'>
             ".sprintf($clang->gT("Only answer this question for the items you selected in question %s ('%s')"),$qidattributes['array_filter'], flattenText(breakToNewline($newquestiontext['question'])))."
             </p>\n";
         }
         if(!empty($qidattributes['array_filter_exclude']))
         {
-            $newquestiontext = Questions::model()->findByAttributes(array('title' => $qidattributes['array_filter_exclude'], 'language' => $surveyprintlang, 'sid' => $surveyid))->getAttribute('question');
+            $newquestiontext = Question::model()->findByAttributes(array('title' => $qidattributes['array_filter_exclude'], 'language' => $surveyprintlang, 'sid' => $surveyid))->getAttribute('question');
 
             $output .= "\n    <p class='extrahelp'>
             ".sprintf($clang->gT("Only answer this question for the items you did not select in question %s ('%s')"),$qidattributes['array_filter_exclude'], breakToNewline($newquestiontext['question']))."

application/controllers/admin/labels.php

@@ -171,7 +171,7 @@ public function index($sa, $lid=0)
         {
             if ($sa == "editlabelset" && Permission::model()->hasGlobalPermission('labelsets','update'))
             {
-                $result = Labelsets::model()->findAllByAttributes(array('lid' => $lid));
+                $result = LabelSet::model()->findAllByAttributes(array('lid' => $lid));
                 foreach ($result as $row)
                 {
                     $row = $row->attributes;
@@ -241,7 +241,7 @@ public function view($lid = 0)
         if (Permission::model()->hasGlobalPermission('labelsets','read'))
         {
             // Get a result containing labelset with the specified id
-            $result = Labelsets::model()->findByAttributes(array('lid' => $lid));
+            $result = LabelSet::model()->findByAttributes(array('lid' => $lid));
 
             // If there is label id in the variable $lid and there are labelset records in the database
             $labelset_exists = !empty($result);
@@ -366,7 +366,7 @@ public function exportmulti()
 
     public function getAllSets()
     {
-        $results = Labelsets::model()->findAll();
+        $results = LabelSet::model()->findAll();
 
         $output = array();
 
@@ -391,7 +391,7 @@ public function ajaxSets()
         $language = trim($language);
         if ($lid == 0)
         {
-            $lset = new Labelsets;
+            $lset = new LabelSet;
             $lset->label_name = sanitize_xss_string(Yii::app()->getRequest()->getPost('laname'));
             $lset->languages = sanitize_xss_string($language);
             $lset->save();