diff --git a/application/models/Label.php b/application/models/Label.php index 34d8ab2fbec..3780ee0db12 100644 --- a/application/models/Label.php +++ b/application/models/Label.php @@ -69,18 +69,20 @@ public function rules() } - function getAllRecords($condition=FALSE) + /** + * @param mixed|bool $condition + * @return static[] + */ + public function getAllRecords($condition=FALSE) { + $criteria = new CDbCriteria; if ($condition != FALSE) { foreach ($condition as $item => $value) { - //FIXME this is broken: $criteria is not initiated $criteria->addCondition($item.'="'.$value.'"'); } } - $data = $this->findAll($criteria); - - return $data; + return $this->findAll($criteria); } /** @@ -89,7 +91,7 @@ function getAllRecords($condition=FALSE) */ public function getLabelCodeInfo($lid) { - return Yii::app()->db->createCommand()->select('code, title, sortorder, language, assessment_value')->order('language, sortorder, code')->where('lid=:lid')->from(tableName())->bindParam(":lid", $lid, PDO::PARAM_INT)->query()->readAll(); + return Yii::app()->db->createCommand()->select('code, title, sortorder, language, assessment_value')->order('language, sortorder, code')->where('lid=:lid')->from($this->tableName())->bindParam(":lid", $lid, PDO::PARAM_INT)->query()->readAll(); } function insertRecords($data) diff --git a/application/models/LabelSet.php b/application/models/LabelSet.php index 92765f785f0..f230e4891cb 100644 --- a/application/models/LabelSet.php +++ b/application/models/LabelSet.php @@ -55,20 +55,21 @@ public function rules() ); } - function getAllRecords($condition=FALSE) + + /** + * @param mixed|bool $condition + * @return static[] + */ + public function getAllRecords($condition=FALSE) { - if ($condition != FALSE) - { - foreach ($condition as $item => $value) - { - // FIXME this is broken + $criteria = new CDbCriteria; + if ($condition != FALSE) { + foreach ($condition as $item => $value) { $criteria->addCondition($item.'="'.$value.'"'); } } - $data = $this->findAll($criteria); - - return $data; + return $this->findAll($criteria); } /** diff --git a/application/models/Permission.php b/application/models/Permission.php index c5ce6bd0622..2268330b7ce 100644 --- a/application/models/Permission.php +++ b/application/models/Permission.php @@ -286,6 +286,7 @@ public static function getGlobalBasePermissions() */ public static function getPermissions($iUserID, $iEntityID=null, $sEntityName=null) { + $aBasePermissions = array(); if ($sEntityName=='survey') { $aBasePermissions=Permission::model()->getSurveyBasePermissions(); } elseif ($sEntityName=='global') { @@ -327,6 +328,7 @@ public static function getPermissions($iUserID, $iEntityID=null, $sEntityName=nu public static function setPermissions($iUserID, $iEntityID, $sEntityName, $aPermissions, $bBypassCheck=false) { $iUserID = sanitize_int($iUserID); + $aBasePermissions = array(); // Filter global permissions on save if ($sEntityName=='global') { $aBasePermissions=Permission::model()->getGlobalBasePermissions(); diff --git a/application/models/QuestionGroup.php b/application/models/QuestionGroup.php index 81ba0bd294b..430b471ce3f 100644 --- a/application/models/QuestionGroup.php +++ b/application/models/QuestionGroup.php @@ -162,6 +162,7 @@ public function insertNewGroup($aQuestionGroupData) $aAdditionalLanguages = Survey::model()->findByPk($iSurveyID)->additionalLanguages; $aSurveyLanguages=array($sBaseLangauge)+$aAdditionalLanguages; $bFirst = true; + $iGroupID = null; foreach ($aSurveyLanguages as $sLanguage) { if ($bFirst) { $iGroupID=$this->insertRecords($aQuestionGroupData[$sLanguage]); diff --git a/application/models/Survey.php b/application/models/Survey.php index 4b440facc0e..83b9a99ae7c 100644 --- a/application/models/Survey.php +++ b/application/models/Survey.php @@ -529,7 +529,7 @@ public function setGoogleanalyticsapikeysetting($value){ */ public function getGoogleanalyticsapikey(){ if($this->googleanalyticsapikey === "9999useGlobal9999") { - return getGlobalSetting(googleanalyticsapikey); + return getGlobalSetting('googleanalyticsapikey'); } else { return $this->googleanalyticsapikey; } diff --git a/application/models/Token.php b/application/models/Token.php index b8be8a35c43..e3951c5d1cd 100644 --- a/application/models/Token.php +++ b/application/models/Token.php @@ -241,6 +241,7 @@ public function generateTokens() { } $newtokencount = 0; $invalidtokencount=0; + $newtoken = null; foreach ($tkresult as $tkrow) { $bIsValidToken = false; while ($bIsValidToken == false && $invalidtokencount<50) { diff --git a/application/models/UpdateForm.php b/application/models/UpdateForm.php index 88b00b3c1ff..5aaaf78c4f1 100644 --- a/application/models/UpdateForm.php +++ b/application/models/UpdateForm.php @@ -690,7 +690,7 @@ private function _createDbBackup() } } else { $backupDb->result = FALSE; - $backupDb->message = htmlspecialchars(db_backup_failed); + $backupDb->message = htmlspecialchars('db_backup_failed'); } return $backupDb; diff --git a/application/models/UserGroup.php b/application/models/UserGroup.php index c71dec75d6a..fe7a1c37ef0 100644 --- a/application/models/UserGroup.php +++ b/application/models/UserGroup.php @@ -84,7 +84,7 @@ public function getAllRecords($condition=false) $query = 'SELECT * FROM '.$this->tableName().' '.$where_string; - $data = createCommand($query)->query()->resultAll(); + $data = $this->connection->createCommand($query)->query()->resultAll(); return $data; }