Skip to content

Commit

Permalink
Dev Fixed Scrutinizer issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@c-schmitz
c-schmitz committed Nov 28, 2017
1 parent f07406f commit a7fa030
Show file tree
Hide file tree
Showing 7 changed files with 94 additions and 136 deletions.
2 changes: 1 addition & 1 deletion application/controllers/admin/authentication.php
View file
Expand Up @@ -26,7 +26,7 @@
* @package LimeSurvey
* @subpackage Backend
*
* @method void redirect($string|array $url, boolean $terminate, integer $statusCode)
* @method void redirect(string|array $url, boolean $terminate, integer $statusCode)
*/
class Authentication extends Survey_Common_Action
Expand Down
78 changes: 40 additions & 38 deletions application/controllers/admin/checkintegrity.php
View file
Expand Up @@ -50,6 +50,7 @@ public function fixredundancy()
{

$oldsmultidelete = Yii::app()->request->getPost('oldsmultidelete', array());
$aData=[];
$aData['messages'] = array();
if (Permission::model()->hasGlobalPermission('settings', 'update') && Yii::app()->request->getPost('ok') == 'Y') {
$aDelete = $this->_checkintegrity();
Expand Down Expand Up @@ -174,7 +175,7 @@ private function _deleteGroups(array $groups, array $aData)
$criteria->addInCondition('gid', $gids);
QuestionGroup::model()->deleteAll($criteria);
if (QuestionGroup::model()->hasErrors()) {
safeDie(QuestionGroup::model()->getError());
safeDie(join('<br>',QuestionGroup::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting groups: %u groups deleted'), count($groups));

Expand All @@ -191,8 +192,8 @@ private function _deleteQuestions(array $questions, array $aData)
$criteria = new CDbCriteria;
$criteria->addInCondition('qid', $qids);
Question::model()->deleteAll($criteria);
if (Question::model()->hasErrors()) {
safeDie(Question::model()->getError());
if (Question::model()->hasErrors()) {
safeDie(join('<br>',Question::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting questions: %u questions deleted'), count($questions));
return array($criteria, $aData);
Expand All @@ -209,7 +210,7 @@ private function _deleteSurveyLanguageSettings(array $surveyLanguageSettings, ar
$criteria->compare('surveyls_survey_id', $surveyls_survey_ids);
SurveyLanguageSetting::model()->deleteAll($criteria);
if (SurveyLanguageSetting::model()->hasErrors()) {
safeDie(SurveyLanguageSetting::model()->getError());
safeDie(join('<br>',SurveyLanguageSetting::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting survey languagesettings: %u survey languagesettings deleted'), count($surveyLanguageSettings));
return array($criteria, $aData);
Expand All @@ -222,7 +223,7 @@ private function _deleteSurveys(array $surveys, array $aData)
}

if (Survey::model()->hasErrors()) {
safeDie(Survey::model()->getError());
safeDie(join('<br>',Survey::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting surveys: %u surveys deleted'), count($surveys));
return $aData;
Expand All @@ -233,7 +234,7 @@ private function _deleteAnswers(array $answers, array $aData)
foreach ($answers as $aAnswer) {
Answer::model()->deleteAll('qid=:qid AND code=:code', array(':qid'=>$aAnswer['qid'], ':code'=>$aAnswer['code']));
if (Answer::model()->hasErrors()) {
safeDie(Answer::model()->getError());
safeDie(join('<br>',Answer::model()->getErrors()));
}
}
$aData['messages'][] = sprintf(gT('Deleting answers: %u answers deleted'), count($answers));
Expand All @@ -249,7 +250,7 @@ private function _deleteAssessments(array $assessments, array $aData)
$assessments_ids = array();
Assessment::model()->deleteByPk('id', $assessments_ids);
if (Assessment::model()->hasErrors()) {
safeDie(Assessment::model()->getError());
safeDie(join('<br>',Assessment::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting assessments: %u assessment entries deleted'), count($assessments));
return $aData;
Expand All @@ -266,7 +267,7 @@ private function _deleteQuotaMembers(array $aData)
QuotaMember::model()->deleteAllByAttributes($aRecord);
}
if (QuotaLanguageSetting::model()->hasErrors()) {
safeDie(QuotaLanguageSetting::model()->getError());
safeDie(join('<br>',QuotaLanguageSetting::model()->getErrors()));
}
$aData['messages'][] = gT('Deleting orphaned quota members.');
return $aData;
Expand All @@ -283,7 +284,7 @@ private function _deleteQuotaLanguageSettings()
$oCriteria->condition = '(q.id IS NULL)';
QuotaLanguageSetting::model()->deleteAll($oCriteria);
if (QuotaLanguageSetting::model()->hasErrors()) {
safeDie(QuotaLanguageSetting::model()->getError());
safeDie(join('<br>',QuotaLanguageSetting::model()->getErrors()));
}
}

Expand All @@ -299,7 +300,7 @@ private function _deleteQuotas(array $aData)
$oCriteria->condition = '(q.sid IS NULL)';
Quota::model()->deleteAll($oCriteria);
if (Quota::model()->hasErrors()) {
safeDie(Quota::model()->getError());
safeDie(join('<br>',Quota::model()->getErrors()));
}
$aData['messages'][] = gT('Deleting orphaned quotas.');
return $aData;
Expand Down Expand Up @@ -330,7 +331,7 @@ private function _deleteQuestionAttributes(array $questionAttributes, array $aDa

QuestionAttribute::model()->deleteAll($criteria);
if (QuestionAttribute::model()->hasErrors()) {
safeDie(QuestionAttribute::model()->getError());
safeDie(join('<br>',QuestionAttribute::model()->getErrors()));
}
$aData['messages'][] = sprintf(gT('Deleting question attributes: %u attributes deleted'), count($questionAttributes));
return $aData;
Expand All @@ -345,7 +346,7 @@ private function _deleteConditions(array $conditions, array $aData)

Condition::model()->deleteByPk($cids);
if (Condition::model()->hasErrors()) {
safeDie(Condition::model()->getError());
safeDie(join('<br>',Condition::model()->getErrors()));
}

$aData['messages'][] = sprintf(gT('Deleting conditions: %u conditions deleted'), count($conditions));
Expand Down Expand Up @@ -462,7 +463,7 @@ protected function _checkintegrity()
if (!array_key_exists($condition['cqid'], $okQuestion)) {
$iRowCount = Question::model()->countByAttributes(array('qid' => $condition['cqid']));
if (Question::model()->hasErrors()) {
safeDie(Question::model()->getError());
safeDie(join('<br>',Question::model()->getErrors()));
}
if (!$iRowCount) {
$aDelete['conditions'][] = array('cid' => $condition['cid'], 'reason' => gT('No matching CQID'));
Expand All @@ -479,8 +480,8 @@ protected function _checkintegrity()
list ($surveyid, $gid, $rest) = explode('X', $condition['cfieldname']);

$iRowCount = count(QuestionGroup::model()->findAllByAttributes(array('gid'=>$gid)));
if (QuestionGroup::model()->hasErrors()) {
safeDie(QuestionGroup::model()->getError());
if (QuestionGroup::model()->hasErrors()) {
safeDie(join('<br>',QuestionGroup::model()->getErrors()));
}

if (!$iRowCount) {
Expand All @@ -498,7 +499,7 @@ protected function _checkintegrity()
/**********************************************************************/
$question_attributes = QuestionAttribute::model()->findAllBySql('select qid from {{question_attributes}} where qid not in (select qid from {{questions}})');
if (QuestionAttribute::model()->hasErrors()) {
safeDie(QuestionAttribute::model()->getError());
safeDie(join('<br>',QuestionAttribute::model()->getErrors()));
}
foreach ($question_attributes as $question_attribute) {
$aDelete['questionattributes'][] = array('qid' => $question_attribute['qid']);
Expand All @@ -514,7 +515,7 @@ protected function _checkintegrity()
$aRecords = DefaultValue::model()->findAll($oCriteria);
$aDelete['defaultvalues'] = count($aRecords);
if (DefaultValue::model()->hasErrors()) {
safeDie(DefaultValue::model()->getError());
safeDie(join('<br>',DefaultValue::model()->getErrors()));
}

/**********************************************************************/
Expand All @@ -526,7 +527,7 @@ protected function _checkintegrity()
$oCriteria->condition = '(s.sid IS NULL)';
$aDelete['quotas'] = count(Quota::model()->findAll($oCriteria));
if (Quota::model()->hasErrors()) {
safeDie(Quota::model()->getError());
safeDie(join('<br>',Quota::model()->getErrors()));
}

/**********************************************************************/
Expand All @@ -537,7 +538,7 @@ protected function _checkintegrity()
$oCriteria->condition = '(s.id IS NULL)';
$aDelete['quotals'] = count(QuotaLanguageSetting::model()->findAll($oCriteria));
if (QuotaLanguageSetting::model()->hasErrors()) {
safeDie(QuotaLanguageSetting::model()->getError());
safeDie(join('<br>',QuotaLanguageSetting::model()->getErrors()));
}

/**********************************************************************/
Expand All @@ -549,7 +550,7 @@ protected function _checkintegrity()

$aDelete['quotamembers'] = count(QuotaMember::model()->findAll($oCriteria));
if (QuotaMember::model()->hasErrors()) {
safeDie(QuotaMember::model()->getError());
safeDie(join('<br>',QuotaMember::model()->getErrors()));
}

/**********************************************************************/
Expand All @@ -559,12 +560,12 @@ protected function _checkintegrity()
$oCriteria->compare('scope', 'T');
$assessments = Assessment::model()->findAll($oCriteria);
if (Assessment::model()->hasErrors()) {
safeDie(Assessment::model()->getError());
safeDie(join('<br>',Assessment::model()->getErrors()));
}
foreach ($assessments as $assessment) {
$iAssessmentCount = count(Survey::model()->findAllByPk($assessment['sid']));
if (Survey::model()->hasErrors()) {
safeDie(Survey::model()->getError());
safeDie(join('<br>',Survey::model()->getErrors()));
}
if (!$iAssessmentCount) {
$aDelete['assessments'][] = array('id' => $assessment['id'], 'assessment' => $assessment['name'], 'reason' => gT('No matching survey'));
Expand All @@ -575,12 +576,13 @@ protected function _checkintegrity()
$oCriteria->compare('scope', 'G');
$assessments = Assessment::model()->findAll($oCriteria);
if (Assessment::model()->hasErrors()) {
safeDie(Assessment::model()->getError());
safeDie(join('<br>',Assessment::model()->getErrors()));

}
foreach ($assessments as $assessment) {
$iAssessmentCount = count(QuestionGroup::model()->findAllByPk(array('gid'=>$assessment['gid'], 'language'=>$assessment['language'])));
if (QuestionGroup::model()->hasErrors()) {
safeDie(QuestionGroup::model()->getError());
safeDie(join('<br>',QuestionGroup::model()->getErrors()));
}
if (!$iAssessmentCount) {
$aDelete['assessments'][] = array('id' => $assessment['id'], 'assessment' => $assessment['name'], 'reason' => gT('No matching group'));
Expand Down Expand Up @@ -636,7 +638,7 @@ protected function _checkintegrity()
$oCriteria->condition = '(s.sid IS NULL)';
$surveys_languagesettings = SurveyLanguageSetting::model()->findAll($oCriteria);
if (SurveyLanguageSetting::model()->hasErrors()) {
safeDie(SurveyLanguageSetting::model()->getError());
safeDie(join('<br>',SurveyLanguageSetting::model()->getErrors()));
}
foreach ($surveys_languagesettings as $surveys_languagesetting) {
$aDelete['surveylanguagesettings'][] = array('slid' => $surveys_languagesetting['surveyls_survey_id'], 'reason' => gT('The related survey is missing.'));
Expand All @@ -650,7 +652,7 @@ protected function _checkintegrity()
$oCriteria->condition = '(g.gid IS NULL) OR (s.sid IS NULL)';
$questions = Question::model()->findAll($oCriteria);
if (Question::model()->hasErrors()) {
safeDie(Question::model()->getError());
safeDie(join('<br>',Question::model()->getErrors()));
}
foreach ($questions as $question) {
$aDelete['questions'][] = array('qid' => $question['qid'], 'reason' => gT('No matching group')." ({$question['gid']})");
Expand Down Expand Up @@ -689,7 +691,7 @@ protected function _checkintegrity()
//$oResult = dbExecuteAssoc($sQuery) or safeDie('Couldn\'t get unique survey ids');
$surveys = Survey::model()->findAll();
if (Survey::model()->hasErrors()) {
safeDie(Survey::model()->getError());
safeDie(join('<br>',Survey::model()->getErrors()));
}

$aSIDs = array();
Expand Down Expand Up @@ -719,11 +721,11 @@ protected function _checkintegrity()
$sType = gT('timings');
}

$iYear = substr($sDateTime, 0, 4);
$iMonth = substr($sDateTime, 4, 2);
$iDay = substr($sDateTime, 6, 2);
$iHour = substr($sDateTime, 8, 2);
$iMinute = substr($sDateTime, 10, 2);
$iYear = (int)substr($sDateTime, 0, 4);
$iMonth = (int)substr($sDateTime, 4, 2);
$iDay = (int)substr($sDateTime, 6, 2);
$iHour = (int)substr($sDateTime, 8, 2);
$iMinute = (int)substr($sDateTime, 10, 2);
$sDate = date('Y-m-d H:i:s', mktime($iHour, $iMinute, 0, $iMonth, $iDay, $iYear));

$dateformatdetails = getDateFormatData(Yii::app()->session['dateformat']);
Expand Down Expand Up @@ -765,7 +767,7 @@ protected function _checkintegrity()
$aOldTokenSIDs = array_unique($aTokenSIDs);
$surveys = Survey::model()->findAll();
if (Survey::model()->hasErrors()) {
safeDie(Survey::model()->getError());
safeDie(join('<br>',Survey::model()->getErrors()));
}
$aSIDs = array();
foreach ($surveys as $survey) {
Expand All @@ -779,11 +781,11 @@ protected function _checkintegrity()
} else {
foreach ($aFullOldTokenSIDs[$iOldTokenSID] as $sTableName) {
list($sOldText, $sTokensText, $iSurveyID, $sDateTime) = explode('_', substr($sTableName, strlen($sDBPrefix)));
$iYear = substr($sDateTime, 0, 4);
$iMonth = substr($sDateTime, 4, 2);
$iDay = substr($sDateTime, 6, 2);
$iHour = substr($sDateTime, 8, 2);
$iMinute = substr($sDateTime, 10, 2);
$iYear = (int)substr($sDateTime, 0, 4);
$iMonth = (int)substr($sDateTime, 4, 2);
$iDay = (int)substr($sDateTime, 6, 2);
$iHour = (int)substr($sDateTime, 8, 2);
$iMinute = (int)substr($sDateTime, 10, 2);
$sDate = date('D, d M Y h:i a', mktime($iHour, $iMinute, 0, $iMonth, $iDay, $iYear));
$sQuery = 'SELECT count(*) as recordcount FROM '.$sTableName;

Expand Down

0 comments on commit a7fa030

Please sign in to comment.