diff --git a/application/controllers/admin/conditionsaction.php b/application/controllers/admin/conditionsaction.php index 15942152875..34d6232ce39 100644 --- a/application/controllers/admin/conditionsaction.php +++ b/application/controllers/admin/conditionsaction.php @@ -22,9 +22,9 @@ */ class conditionsaction extends Survey_Common_Action { - function index($subaction, $surveyid=null, $gid=null, $qid=null) + function index($subaction, $iSurveyID=null, $gid=null, $qid=null) { - $surveyid = sanitize_int($surveyid); + $iSurveyID = sanitize_int($iSurveyID); $gid = sanitize_int($gid); $qid = sanitize_int($qid); @@ -35,7 +35,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) if( !empty($_POST['subaction']) ) $subaction=Yii::app()->request->getPost('subaction'); //BEGIN Sanitizing POSTed data - if ( !isset($surveyid) ) { $surveyid = returnGlobal('sid'); } + if ( !isset($iSurveyID) ) { $iSurveyID = returnGlobal('sid'); } if ( !isset($qid) ) { $qid = returnGlobal('qid'); } if ( !isset($gid) ) { $gid = returnGlobal('gid'); } if ( !isset($p_scenario)) {$p_scenario=returnGlobal('scenario');} @@ -120,7 +120,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $br = CHtml::openTag('br /'); //MAKE SURE THAT THERE IS A SID - if (!isset($surveyid) || !$surveyid) + if (!isset($iSurveyID) || !$iSurveyID) { $conditionsoutput = $clang->gT("You have not selected a survey").str_repeat($br, 2); $conditionsoutput .= CHtml::submitButton($clang->gT("Main admin screen"), array( @@ -130,37 +130,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) return; } - // MAKE SURE THAT THERE IS A QID - if ( !isset($qid) || !$qid ) - { - $conditionsoutput = $clang->gT("You have not selected a question").str_repeat($br, 2); - $conditionsoutput .= CHtml::submitButton($clang->gT("Main admin screen"), array( - 'onclick' => "window.open('".$this->getController()->createUrl("admin/")."', '_top')" - )).$br; - safeDie($conditionsoutput); - return; - } - - // If we made it this far, then lets develop the menu items - // add the conditions container table - - $extraGetParams = ""; - if (isset($qid) && isset($gid)) - { - $extraGetParams = "/gid/{$gid}/qid/{$qid}"; - } - - $conditionsoutput_action_error = ""; // defined during the actions - - $markcidarray = Array(); - if ( isset($_GET['markcid']) ) - { - $markcidarray = explode("-", $_GET['markcid']); - } - - //BEGIN PROCESS ACTIONS - // ADD NEW ENTRY IF THIS IS AN ADD if (isset($p_subaction) && $p_subaction == "resetsurveylogic") { @@ -174,16 +144,16 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) if (!isset($_GET['ok'])) { - $this->getController()->_getAdminHeader(); $button_yes = CHtml::submitButton($clang->gT("Yes"), array( - 'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/resetsurveylogic/surveyid/$surveyid")."?ok=Y"."', '_top')" + 'onclick' => "window.open('".$this->getController()->createUrl("admin/conditions/index/subaction/resetsurveylogic/surveyid/$iSurveyID")."?ok=Y"."', '_top')" )); $button_cancel = CHtml::submitButton($clang->gT("Cancel"), array( - 'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/view/surveyid/$surveyid")."', '_top')" + 'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/view/surveyid/$iSurveyID")."', '_top')" )); - $messagebox_content = $clang->gT("You are about to delete all conditions on this survey's questions")."($surveyid)" + $messagebox_content = $clang->gT("You are about to delete all conditions on this survey's questions")."($iSurveyID)" . $br . $clang->gT("We recommend that before you proceed, you export the entire survey from the main administration screen.") + . $br . $clang->gT("Continue?") . $br . $button_yes . $button_cancel; $this->_renderWrappedTemplate('conditions', array('message' => array( @@ -194,22 +164,48 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) } else { - LimeExpressionManager::RevertUpgradeConditionsToRelevance($surveyid); - Conditions::model()->deleteRecords('qid in (select qid from {{questions}} where sid=$surveyid)'); - - $resetsurveylogicoutput .= CHtml::openTag('tr'); - $resetsurveylogicoutput .= CHtml::openTag('tr', array('align'=>'center')).$br; - $resetsurveylogicoutput .= CHtml::openTag('strong'); - $resetsurveylogicoutput .= $clang->gT("All conditions in this survey have been deleted.").str_repeat($br, 2); - $resetsurveylogicoutput .= submitButton($clang->gT("Continue"), array( - 'onclick' => "window.open('".$this->getController()->createUrl('/admin/survey/view/surveyid/'.$surveyid)."', '_top')" - )); - $resetsurveylogicoutput .= CHtml::closeTag('strong').CHtml::closeTag('td'); - $resetsurveylogicoutput .= CHtml::closeTag('tr'); - $aData['conditionsoutput'] = $resetsurveylogicoutput; + LimeExpressionManager::RevertUpgradeConditionsToRelevance($iSurveyID); + Conditions::model()->deleteRecords("qid in (select qid from {{questions}} where sid={$iSurveyID})"); + Yii::app()->session['flashmessage']=$clang->gT("All conditions in this survey have been deleted."); + $this->getController()->redirect($this->getController()->createUrl('/admin/survey/view/surveyid/'.$iSurveyID)); + } } + + + // MAKE SURE THAT THERE IS A QID + if ( !isset($qid) || !$qid ) + { + $conditionsoutput = $clang->gT("You have not selected a question").str_repeat($br, 2); + $conditionsoutput .= CHtml::submitButton($clang->gT("Main admin screen"), array( + 'onclick' => "window.open('".$this->getController()->createUrl("admin/")."', '_top')" + )).$br; + safeDie($conditionsoutput); + return; + } + + + // If we made it this far, then lets develop the menu items + // add the conditions container table + + $extraGetParams = ""; + if (isset($qid) && isset($gid)) + { + $extraGetParams = "/gid/{$gid}/qid/{$qid}"; + } + + $conditionsoutput_action_error = ""; // defined during the actions + + $markcidarray = Array(); + if ( isset($_GET['markcid']) ) + { + $markcidarray = explode("-", $_GET['markcid']); + } + + //BEGIN PROCESS ACTIONS + // ADD NEW ENTRY IF THIS IS AN ADD + if (isset($p_subaction) && $p_subaction == "insertcondition") { if (( !isset($p_canswers) && @@ -511,7 +507,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) ); } } - LimeExpressionManager::UpgradeConditionsToRelevance($surveyid); // do for whole survey, since don't know which questions affected. + LimeExpressionManager::UpgradeConditionsToRelevance($iSurveyID); // do for whole survey, since don't know which questions affected. } //END PROCESS ACTIONS @@ -521,10 +517,10 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) //BEGIN: GATHER INFORMATION // 1: Get information for this question if (!isset($qid)) { $qid = returnGlobal('qid'); } - if (!isset($surveyid)) { $surveyid = returnGlobal('sid'); } - $thissurvey = getSurveyInfo($surveyid); + if (!isset($iSurveyID)) { $iSurveyID = returnGlobal('sid'); } + $thissurvey = getSurveyInfo($iSurveyID); - $qresult = Questions::model()->with('groups')->findByAttributes(array('qid' => $qid, 'parent_qid' => 0, 'language' => Survey::model()->findByPk($surveyid)->language)); + $qresult = Questions::model()->with('groups')->findByAttributes(array('qid' => $qid, 'parent_qid' => 0, 'language' => Survey::model()->findByPk($iSurveyID)->language)); $questiongroupname = $qresult->groups->group_name; $questiontitle = $qresult['title']; $questiontext = $qresult['question']; @@ -538,9 +534,9 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $qresult = Questions::model()->with(array( 'groups' => array( 'condition' => 'groups.language = :lang', - 'params' => array(':lang' => Survey::model()->findByPk($surveyid)->language), + 'params' => array(':lang' => Survey::model()->findByPk($iSurveyID)->language), ), - ))->findAllByAttributes(array('parent_qid' => 0, 'sid' => $surveyid, 'language' => Survey::model()->findByPk($surveyid)->language)); + ))->findAllByAttributes(array('parent_qid' => 0, 'sid' => $iSurveyID, 'language' => Survey::model()->findByPk($iSurveyID)->language)); $qrows = array(); foreach ($qresult as $k => $v) $qrows[$k] = array_merge($v->attributes, $v->groups->attributes); @@ -590,9 +586,9 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $result = Questions::model()->with(array( 'groups' => array( 'condition' => 'groups.language = :lang', - 'params' => array(':lang' => Survey::model()->findByPk($surveyid)->language), + 'params' => array(':lang' => Survey::model()->findByPk($iSurveyID)->language), ), - ))->findAllByAttributes(array('qid' => $ql, 'parent_qid' => 0, 'sid' => $surveyid, 'language' => Survey::model()->findByPk($surveyid)->language)); + ))->findAllByAttributes(array('qid' => $ql, 'parent_qid' => 0, 'sid' => $iSurveyID, 'language' => Survey::model()->findByPk($iSurveyID)->language)); $thiscount = count($result); @@ -620,9 +616,9 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $result = Questions::model()->with(array( 'groups' => array( 'condition' => 'groups.language = :lang', - 'params' => array(':lang' => Survey::model()->findByPk($surveyid)->language), + 'params' => array(':lang' => Survey::model()->findByPk($iSurveyID)->language), ), - ))->findAllByAttributes(array('qid' => $pq, 'parent_qid' => 0, 'sid' => $surveyid, 'language' => Survey::model()->findByPk($surveyid)->language)); + ))->findAllByAttributes(array('qid' => $pq, 'parent_qid' => 0, 'sid' => $iSurveyID, 'language' => Survey::model()->findByPk($iSurveyID)->language)); $postcount = count($result); @@ -671,7 +667,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $rows['type'] == "H" ) { - $aresult = Questions::model()->findAllByAttributes(array('parent_qid'=>$rows['qid'], 'language' => Survey::model()->findByPk($surveyid)->language), array('order' => 'question_order ASC')); + $aresult = Questions::model()->findAllByAttributes(array('parent_qid'=>$rows['qid'], 'language' => Survey::model()->findByPk($iSurveyID)->language), array('order' => 'question_order ASC')); foreach ($aresult as $arows) { @@ -710,7 +706,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $fresult = Answers::model()->findAllByAttributes(array( 'qid' => $rows['qid'], - "language" => Survey::model()->findByPk($surveyid)->language, + "language" => Survey::model()->findByPk($iSurveyID)->language, 'scale_id' => 0, ), array('order' => 'sortorder, code')); @@ -759,13 +755,13 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $fquery = "SELECT sq.*, q.other" ." FROM {{questions sq}}, {{questions q}}" - ." WHERE sq.sid=$surveyid AND sq.parent_qid=q.qid " + ." WHERE sq.sid=$iSurveyID AND sq.parent_qid=q.qid " . "AND q.language=:lang" ." AND sq.language=:lang" ." AND q.qid=:qid AND sq.scale_id=0 ORDER BY sq.question_order"; - $sLanguage=Survey::model()->findByPk($surveyid)->language; + $sLanguage=Survey::model()->findByPk($iSurveyID)->language; $y_axis_db = Yii::app()->db->createCommand($fquery) ->bindParam(":lang", $sLanguage, PDO::PARAM_STR) ->bindParam(":qid", $rows['qid'], PDO::PARAM_INT) @@ -774,7 +770,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) // Get the X-Axis $aquery = "SELECT sq.* FROM {{questions q}}, {{questions sq}} - WHERE q.sid=$surveyid + WHERE q.sid=$iSurveyID AND sq.parent_qid=q.qid AND q.language=:lang AND sq.language=:lang @@ -812,7 +808,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) } //if A,B,C,E,F,H elseif ($rows['type'] == "1") //Multi Scale { - $aresult = Questions::model()->findAllByAttributes(array('parent_qid' => $rows['qid'], 'language' => Survey::model()->findByPk($surveyid)->language), array('order' => 'question_order desc')); + $aresult = Questions::model()->findAllByAttributes(array('parent_qid' => $rows['qid'], 'language' => Survey::model()->findByPk($iSurveyID)->language), array('order' => 'question_order desc')); foreach ($aresult as $arows) { @@ -828,7 +824,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $cquestions[] = array($shortquestion, $rows['qid'], $rows['type'], $rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title']."#1"); // first label - $lresult = Answers::model()->findAllByAttributes(array('qid' => $rows['qid'], 'scale_id' => 0, 'language' => Survey::model()->findByPk($surveyid)->language), array('order' => 'sortorder, answer')); + $lresult = Answers::model()->findAllByAttributes(array('qid' => $rows['qid'], 'scale_id' => 0, 'language' => Survey::model()->findByPk($iSurveyID)->language), array('order' => 'sortorder, answer')); foreach ($lresult as $lrows) { $canswers[]=array($rows['sid'].$X.$rows['gid'].$X.$rows['qid'].$arows['title']."#0", "{$lrows['code']}", "{$lrows['code']}"); @@ -838,7 +834,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $lresult = Answers::model()->findAllByAttributes(array( 'qid' => $rows['qid'], 'scale_id' => 1, - 'language' => Survey::model()->findByPk($surveyid)->language, + 'language' => Survey::model()->findByPk($iSurveyID)->language, ), array('order' => 'sortorder, answer')); foreach ($lresult as $lrows) @@ -858,7 +854,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) { $aresult = Questions::model()->findAllByAttributes(array( "parent_qid" => $rows['qid'], - "language" =>Survey::model()->findByPk($surveyid)->language, + "language" =>Survey::model()->findByPk($iSurveyID)->language, ), array('order' => 'question_order desc')); foreach ($aresult as $arows) @@ -880,7 +876,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $aresult = Answers::model()->findAllByAttributes(array( "qid" => $rows['qid'], "scale_id" => 0, - "language" => Survey::model()->findByPk($surveyid)->language, + "language" => Survey::model()->findByPk($iSurveyID)->language, ), array('order' => 'sortorder, answer')); $acount = count($aresult); @@ -912,7 +908,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $aresult = Questions::model()->findAllByAttributes(array( "parent_qid" => $rows['qid'], - "language" => Survey::model()->findByPk($surveyid)->language, + "language" => Survey::model()->findByPk($iSurveyID)->language, ), array('order' => 'question_order desc')); foreach ($aresult as $arows) @@ -981,7 +977,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $aresult = Answers::model()->findAllByAttributes(array( 'qid' => $rows['qid'], 'scale_id' => 0, - 'language' => Survey::model()->findByPk($surveyid)->language, + 'language' => Survey::model()->findByPk($iSurveyID)->language, ), array('order' => 'sortorder, answer')); foreach ($aresult as $arows) @@ -1041,7 +1037,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) } $questionNavOptions .= CHtml::tag('option', array( - 'value' => $this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/{$row['gid']}/qid/{$row['qid']}")), + 'value' => $this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")), $questionselecter ); } @@ -1059,7 +1055,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) } $questionNavOptions .= CHtml::tag('option', array( - 'value'=>$this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/$gid/qid/$qid"), + 'value'=>$this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/$gid/qid/$qid"), 'selected'=>'selected'), $questiontitle .': '. $questiontextshort); $questionNavOptions .= CHtml::closeTag('optgroup'); @@ -1079,7 +1075,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $questionselecter = htmlspecialchars(mb_strcut(html_entity_decode($question,ENT_QUOTES,'UTF-8'), 0, 35, 'UTF-8'))."..."; } $questionNavOptions .= CHtml::tag('option', array( - 'value' => $this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$surveyid/gid/{$row['gid']}/qid/{$row['qid']}")), + 'value' => $this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")), $row['title'].':'.$questionselecter ); } @@ -1141,7 +1137,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $aViewUrls = array(); $aData['clang'] = $clang; - $aData['surveyid'] = $surveyid; + $aData['surveyid'] = $iSurveyID; $aData['qid'] = $qid; $aData['gid'] = $gid; $aData['imageurl'] = $imageurl; @@ -1261,7 +1257,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) ."AND c.scenario=:scenario " ."AND c.cfieldname NOT LIKE '{%' " // avoid catching SRCtokenAttr conditions ."ORDER BY g.group_order, q.question_order, c.cfieldname"; - $sLanguage=Survey::model()->findByPk($surveyid)->language; + $sLanguage=Survey::model()->findByPk($iSurveyID)->language; $result=Yii::app()->db->createCommand($query) ->bindValue(":scenario", $scenarionr['scenario']) ->bindValue(":qid", $qid, PDO::PARAM_INT) @@ -1335,7 +1331,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) } $aViewUrls['output'] .= "\t\n" - ."\t
\n" + ."\t\n" ."\n" ."\t\n"; @@ -1354,7 +1350,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) if ($thissurvey['anonymized'] != 'Y' && preg_match('/^{TOKEN:([^}]*)}$/',$rows['cfieldname'],$extractedTokenAttr) > 0) { $leftOperandType = 'tokenattr'; - $aTokenAttrNames=getTokenFieldsAndNames($surveyid); + $aTokenAttrNames=getTokenFieldsAndNames($iSurveyID); if (count($aTokenAttrNames) != 0) { $thisAttrName=HTMLEscape($aTokenAttrNames[strtolower($extractedTokenAttr[1])])." [".$clang->gT("From token table")."]"; @@ -1427,7 +1423,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) elseif ($thissurvey['anonymized'] != 'Y' && preg_match('/^{TOKEN:([^}]*)}$/',$rows['value'],$extractedTokenAttr) > 0) { $rightOperandType = 'tokenAttr'; - $aTokenAttrNames=getTokenFieldsAndNames($surveyid); + $aTokenAttrNames=getTokenFieldsAndNames($iSurveyID); if (count($aTokenAttrNames) != 0) { $thisAttrName=HTMLEscape($aTokenAttrNames[strtolower($extractedTokenAttr[1])])." [".$clang->gT("From token table")."]"; @@ -1566,7 +1562,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) if ($subaction == "copyconditionsform" || $subaction == "copyconditions") { $aViewUrls['output'] .= "
\n" - ."\n"; + ."\n"; $aViewUrls['output'] .= "
".$clang->gT("Copy conditions")."
\n"; @@ -1615,7 +1611,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) // ."\t\tgT("Are you sure you want to copy these condition(s) to the questions you have selected?","js")."')){ prepareCopyconditions(); return true;} else { return false;}\" $disableCopyCondition/>\n" ."\t\t\n" ."\n" - ."\n" + ."\n" ."\n" ."\n" ."\n"; @@ -1670,7 +1666,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $subaction == "updatescenario" || $subaction == "editthiscondition" || $subaction == "delete") { - $aViewUrls['output'] .= "\n"; + $aViewUrls['output'] .= "\n"; if ($subaction == "editthiscondition" && isset($p_cid)) { $mytitle = $clang->gT("Edit condition"); @@ -1746,7 +1742,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) // Source token Tab $aViewUrls['output'] .= "
\n"; - foreach (getTokenFieldsAndNames($surveyid) as $tokenattr => $tokenattrName) + foreach (getTokenFieldsAndNames($iSurveyID) as $tokenattr => $tokenattrName) { $aViewUrls['output'] .= "\t\t\n"; } @@ -1915,7 +1911,7 @@ function index($subaction, $surveyid=null, $gid=null, $qid=null) $aViewUrls['output'] .= "
\n" ."\t\n" ."\t\n" - ."\n" + ."\n" ."\n" ."\n" ."\n" diff --git a/application/core/Survey_Common_Action.php b/application/core/Survey_Common_Action.php index b09e35a825a..e09290bb0b6 100644 --- a/application/core/Survey_Common_Action.php +++ b/application/core/Survey_Common_Action.php @@ -315,12 +315,12 @@ protected function _renderWrappedTemplate($sAction = '', $aViewUrls = array(), $ * @param int Question id * @param string action */ - function _questionbar($iSurveyId, $gid, $qid, $action = null) + function _questionbar($iSurveyID, $gid, $qid, $action = null) { $clang = $this->getController()->lang; - $baselang = Survey::model()->findByPk($iSurveyId)->language; + $baselang = Survey::model()->findByPk($iSurveyID)->language; //Show Question Details //Count answer-options for this question @@ -332,14 +332,14 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) $sqrq = Questions::model()->findAllByAttributes(array('parent_qid' => $qid, 'language' => $baselang)); $aData['sqct'] = $sqct = count($sqrq); - $qrresult = Questions::model()->findAllByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyId, 'language' => $baselang)); + $qrresult = Questions::model()->findAllByAttributes(array('qid' => $qid, 'gid' => $gid, 'sid' => $iSurveyID, 'language' => $baselang)); $questionsummary = "
\n"; // Check if other questions in the Survey are dependent upon this question - $condarray = getQuestDepsForConditions($iSurveyId, "all", "all", $qid, "by-targqid", "outsidegroup"); + $condarray = getQuestDepsForConditions($iSurveyID, "all", "all", $qid, "by-targqid", "outsidegroup"); - $sumresult1 = Survey::model()->findByPk($iSurveyId); + $sumresult1 = Survey::model()->findByPk($iSurveyID); if (is_null($sumresult1)) { die('Invalid survey id'); @@ -352,13 +352,13 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) foreach ($qrresult as $qrrow) { $qrrow = $qrrow->attributes; - if (hasSurveyPermission($iSurveyId, 'surveycontent', 'read')) + if (hasSurveyPermission($iSurveyID, 'surveycontent', 'read')) { - if (count(Survey::model()->findByPk($iSurveyId)->additionalLanguages) != 0) + if (count(Survey::model()->findByPk($iSurveyID)->additionalLanguages) != 0) { Yii::app()->loadHelper('surveytranslator'); - $tmp_survlangs = Survey::model()->findByPk($iSurveyId)->additionalLanguages; - $baselang = Survey::model()->findByPk($iSurveyId)->language; + $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages; + $baselang = Survey::model()->findByPk($iSurveyID)->language; $tmp_survlangs[] = $baselang; rsort($tmp_survlangs); $aData['tmp_survlangs'] = $tmp_survlangs; @@ -375,13 +375,13 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) } $aData['qshowstyle'] = $qshowstyle; $aData['action'] = $action; - $aData['surveyid'] = $iSurveyId; + $aData['surveyid'] = $iSurveyID; $aData['qid'] = $qid; $aData['gid'] = $gid; $aData['clang'] = $clang; $aData['qrrow'] = $qrrow; $aData['baselang'] = $baselang; - $aAttributesWithValues = Questions::model()->getAdvancedSettingsWithValues($qid, $qrrow['type'], $iSurveyId, $baselang); + $aAttributesWithValues = Questions::model()->getAdvancedSettingsWithValues($qid, $qrrow['type'], $iSurveyID, $baselang); $DisplayArray = array(); foreach ($aAttributesWithValues as $aAttribute) { @@ -421,26 +421,26 @@ function _questionbar($iSurveyId, $gid, $qid, $action = null) * @param int Survey id * @param int Group id */ - function _questiongroupbar($iSurveyId, $gid, $qid=null, $action = null) + function _questiongroupbar($iSurveyID, $gid, $qid=null, $action = null) { $clang = $this->getController()->lang; - $baselang = Survey::model()->findByPk($iSurveyId)->language; + $baselang = Survey::model()->findByPk($iSurveyID)->language; Yii::app()->loadHelper('replacements'); // TODO: check that surveyid and thus baselang are always set here - $sumresult4 = Questions::model()->findAllByAttributes(array('sid' => $iSurveyId, 'gid' => $gid, 'language' => $baselang)); + $sumresult4 = Questions::model()->findAllByAttributes(array('sid' => $iSurveyID, 'gid' => $gid, 'language' => $baselang)); $sumcount4 = count($sumresult4); $grpresult = Groups::model()->findAllByAttributes(array('gid' => $gid, 'language' => $baselang)); // Check if other questions/groups are dependent upon this group - $condarray = getGroupDepsForConditions($iSurveyId, "all", $gid, "by-targgid"); + $condarray = getGroupDepsForConditions($iSurveyID, "all", $gid, "by-targgid"); $groupsummary = "
\n" . "
\n"; - //$sumquery1 = "SELECT * FROM ".db_table_name('surveys')." inner join ".db_table_name('surveys_languagesettings')." on (surveyls_survey_id=sid and surveyls_language=language) WHERE sid=$iSurveyId"; //Getting data for this survey - $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyId); //$sumquery1, 1) ; //Checked // if surveyid is invalid then die to prevent errors at a later time + //$sumquery1 = "SELECT * FROM ".db_table_name('surveys')." inner join ".db_table_name('surveys_languagesettings')." on (surveyls_survey_id=sid and surveyls_language=language) WHERE sid=$iSurveyID"; //Getting data for this survey + $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyID); //$sumquery1, 1) ; //Checked // if surveyid is invalid then die to prevent errors at a later time $surveyinfo = $sumresult1->attributes; $surveyinfo = array_merge($surveyinfo, $sumresult1->languagesettings[0]->attributes); $surveyinfo = array_map('flattenText', $surveyinfo); @@ -455,8 +455,8 @@ function _questiongroupbar($iSurveyId, $gid, $qid=null, $action = null) $aData = array(); $aData['activated'] = $activated; $aData['qid'] = $qid; - $aData['QidPrev'] = $QidPrev = getQidPrevious($iSurveyId, $gid, $qid); - $aData['QidNext'] = $QidNext = getQidNext($iSurveyId, $gid, $qid); + $aData['QidPrev'] = $QidPrev = getQidPrevious($iSurveyID, $gid, $qid); + $aData['QidNext'] = $QidNext = getQidNext($iSurveyID, $gid, $qid); if ($action == 'editgroup' || $action == 'addquestion' || $action == 'viewquestion' || $action == "editdefaultvalues") { @@ -468,7 +468,7 @@ function _questiongroupbar($iSurveyId, $gid, $qid=null, $action = null) } $aData['gshowstyle'] = $gshowstyle; - $aData['surveyid'] = $iSurveyId; + $aData['surveyid'] = $iSurveyID; $aData['gid'] = $gid; $aData['grow'] = $grow; $aData['clang'] = $clang; @@ -489,16 +489,16 @@ function _questiongroupbar($iSurveyId, $gid, $qid=null, $action = null) * Shows admin menu for surveys * @param int Survey id */ - function _surveybar($iSurveyId, $gid=null) + function _surveybar($iSurveyID, $gid=null) { //$this->load->helper('surveytranslator'); $clang = $this->getController()->lang; //echo Yii::app()->getConfig('gid'); - $baselang = Survey::model()->findByPk($iSurveyId)->language; - $condition = array('sid' => $iSurveyId, 'language' => $baselang); + $baselang = Survey::model()->findByPk($iSurveyID)->language; + $condition = array('sid' => $iSurveyID, 'language' => $baselang); - //$sumquery1 = "SELECT * FROM ".db_table_name('surveys')." inner join ".db_table_name('surveys_languagesettings')." on (surveyls_survey_id=sid and surveyls_language=language) WHERE sid=$iSurveyId"; //Getting data for this survey - $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyId); //$sumquery1, 1) ; //Checked + //$sumquery1 = "SELECT * FROM ".db_table_name('surveys')." inner join ".db_table_name('surveys_languagesettings')." on (surveyls_survey_id=sid and surveyls_language=language) WHERE sid=$iSurveyID"; //Getting data for this survey + $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyID); //$sumquery1, 1) ; //Checked if (is_null($sumresult1)) { die('Invalid survey id'); @@ -518,19 +518,19 @@ function _surveybar($iSurveyId, $gid=null) //Parse data to send to view $aData['clang'] = $clang; $aData['surveyinfo'] = $surveyinfo; - $aData['surveyid'] = $iSurveyId; + $aData['surveyid'] = $iSurveyID; // ACTIVATE SURVEY BUTTON $aData['activated'] = $activated; - $condition = array('sid' => $iSurveyId, 'parent_qid' => 0, 'language' => $baselang); + $condition = array('sid' => $iSurveyID, 'parent_qid' => 0, 'language' => $baselang); - //$sumquery3 = "SELECT * FROM ".db_table_name('questions')." WHERE sid={$iSurveyId} AND parent_qid=0 AND language='".$baselang."'"; //Getting a count of questions for this survey + //$sumquery3 = "SELECT * FROM ".db_table_name('questions')." WHERE sid={$iSurveyID} AND parent_qid=0 AND language='".$baselang."'"; //Getting a count of questions for this survey $sumresult3 = Questions::model()->findAllByAttributes($condition); //Checked $sumcount3 = count($sumresult3); - $aData['canactivate'] = $sumcount3 > 0 && hasSurveyPermission($iSurveyId, 'surveyactivation', 'update'); - $aData['candeactivate'] = hasSurveyPermission($iSurveyId, 'surveyactivation', 'update'); + $aData['canactivate'] = $sumcount3 > 0 && hasSurveyPermission($iSurveyID, 'surveyactivation', 'update'); + $aData['candeactivate'] = hasSurveyPermission($iSurveyID, 'surveyactivation', 'update'); $aData['expired'] = $surveyinfo['expires'] != '' && ($surveyinfo['expires'] < dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig('timeadjust'))); $aData['notstarted'] = ($surveyinfo['startdate'] != '') && ($surveyinfo['startdate'] > dateShift(date("Y-m-d H:i:s"), "Y-m-d H:i", Yii::app()->getConfig('timeadjust'))); @@ -545,9 +545,9 @@ function _surveybar($iSurveyId, $gid=null) $aData['icontext'] = $clang->gT("Execute this survey"); } - $aData['baselang'] = Survey::model()->findByPk($iSurveyId)->language; + $aData['baselang'] = Survey::model()->findByPk($iSurveyID)->language; - $tmp_survlangs = Survey::model()->findByPk($iSurveyId)->getAdditionalLanguages(); + $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->getAdditionalLanguages(); $aData['onelanguage']=(count($tmp_survlangs)==0); $aData['additionallanguages'] = $tmp_survlangs; $tmp_survlangs[] = $aData['baselang']; @@ -557,48 +557,48 @@ function _surveybar($iSurveyId, $gid=null) $aData['hasadditionallanguages'] = (count($aData['additionallanguages']) > 0); // EDIT SURVEY TEXT ELEMENTS BUTTON - $aData['surveylocale'] = hasSurveyPermission($iSurveyId, 'surveylocale', 'read'); + $aData['surveylocale'] = hasSurveyPermission($iSurveyID, 'surveylocale', 'read'); // EDIT SURVEY SETTINGS BUTTON - $aData['surveysettings'] = hasSurveyPermission($iSurveyId, 'surveysettings', 'read'); + $aData['surveysettings'] = hasSurveyPermission($iSurveyID, 'surveysettings', 'read'); // Survey permission item - $aData['surveysecurity'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || $surveyinfo['owner_id'] == Yii::app()->session['loginID'] || hasSurveyPermission($iSurveyId, 'surveysecurity', 'read')); + $aData['surveysecurity'] = (Yii::app()->session['USER_RIGHT_SUPERADMIN'] == 1 || $surveyinfo['owner_id'] == Yii::app()->session['loginID'] || hasSurveyPermission($iSurveyID, 'surveysecurity', 'read')); // CHANGE QUESTION GROUP ORDER BUTTON - $aData['surveycontent'] = hasSurveyPermission($iSurveyId, 'surveycontent', 'read'); - $aData['groupsum'] = (getGroupSum($iSurveyId, $surveyinfo['language']) > 1); + $aData['surveycontent'] = hasSurveyPermission($iSurveyID, 'surveycontent', 'read'); + $aData['groupsum'] = (getGroupSum($iSurveyID, $surveyinfo['language']) > 1); // SET SURVEY QUOTAS BUTTON - $aData['quotas'] = hasSurveyPermission($iSurveyId, 'quotas', 'read'); + $aData['quotas'] = hasSurveyPermission($iSurveyID, 'quotas', 'read'); // Assessment menu item - $aData['assessments'] = hasSurveyPermission($iSurveyId, 'assessments', 'read'); + $aData['assessments'] = hasSurveyPermission($iSurveyID, 'assessments', 'read'); // EDIT SURVEY TEXT ELEMENTS BUTTON // End if survey properties // Tools menu item // Delete survey item - $aData['surveydelete'] = hasSurveyPermission($iSurveyId, 'survey', 'delete'); + $aData['surveydelete'] = hasSurveyPermission($iSurveyID, 'survey', 'delete'); // Translate survey item - $aData['surveytranslate'] = hasSurveyPermission($iSurveyId, 'translations', 'read'); + $aData['surveytranslate'] = hasSurveyPermission($iSurveyID, 'translations', 'read'); // RESET SURVEY LOGIC BUTTON - //$sumquery6 = "SELECT count(*) FROM ".db_table_name('conditions')." as c, ".db_table_name('questions')." as q WHERE c.qid = q.qid AND q.sid=$iSurveyId"; //Getting a count of conditions for this survey + //$sumquery6 = "SELECT count(*) FROM ".db_table_name('conditions')." as c, ".db_table_name('questions')." as q WHERE c.qid = q.qid AND q.sid=$iSurveyID"; //Getting a count of conditions for this survey // TMSW Conditions->Relevance: How is conditionscount used? Should Relevance do the same? - $query = count(Conditions::model()->findAllByAttributes(array('qid' => $iSurveyId))); - $sumcount6 = $query; //Checked - $aData['surveycontent'] = hasSurveyPermission($iSurveyId, 'surveycontent', 'update'); - $aData['conditionscount'] = ($sumcount6 > 0); + $iConditionCount = Conditions::model()->with(Array('questions'=>array('condition'=>'sid ='.$iSurveyID)))->count(); + + $aData['surveycontent'] = hasSurveyPermission($iSurveyID, 'surveycontent', 'update'); + $aData['conditionscount'] = ($iConditionCount > 0); // Eport menu item - $aData['surveyexport'] = hasSurveyPermission($iSurveyId, 'surveycontent', 'export'); + $aData['surveyexport'] = hasSurveyPermission($iSurveyID, 'surveycontent', 'export'); // PRINTABLE VERSION OF SURVEY BUTTON // SHOW PRINTABLE AND SCANNABLE VERSION OF SURVEY BUTTON //browse responses menu item - $aData['respstatsread'] = hasSurveyPermission($iSurveyId, 'responses', 'read') || hasSurveyPermission($iSurveyId, 'statistics', 'read') || hasSurveyPermission($iSurveyId, 'responses', 'export'); + $aData['respstatsread'] = hasSurveyPermission($iSurveyID, 'responses', 'read') || hasSurveyPermission($iSurveyID, 'statistics', 'read') || hasSurveyPermission($iSurveyID, 'responses', 'export'); // Data entry screen menu item - $aData['responsescreate'] = hasSurveyPermission($iSurveyId, 'responses', 'create'); - $aData['responsesread'] = hasSurveyPermission($iSurveyId, 'responses', 'read'); + $aData['responsescreate'] = hasSurveyPermission($iSurveyID, 'responses', 'create'); + $aData['responsesread'] = hasSurveyPermission($iSurveyID, 'responses', 'read'); // TOKEN MANAGEMENT BUTTON - $aData['tokenmanagement'] = hasSurveyPermission($iSurveyId, 'surveysettings', 'update') || hasSurveyPermission($iSurveyId, 'tokens', 'read'); + $aData['tokenmanagement'] = hasSurveyPermission($iSurveyID, 'surveysettings', 'update') || hasSurveyPermission($iSurveyID, 'tokens', 'read'); $aData['gid'] = $gid; // = $this->input->post('gid'); - if (hasSurveyPermission($iSurveyId, 'surveycontent', 'read')) + if (hasSurveyPermission($iSurveyID, 'surveycontent', 'read')) { $aData['permission'] = true; } @@ -609,18 +609,18 @@ function _surveybar($iSurveyId, $gid=null) $aData['permission'] = false; } - if (getGroupListLang($gid, $baselang, $iSurveyId)) + if (getGroupListLang($gid, $baselang, $iSurveyID)) { - $aData['groups'] = getGroupListLang($gid, $baselang, $iSurveyId); + $aData['groups'] = getGroupListLang($gid, $baselang, $iSurveyID); } else { $aData['groups'] = ""; } - $aData['GidPrev'] = $GidPrev = getGidPrevious($iSurveyId, $gid); + $aData['GidPrev'] = $GidPrev = getGidPrevious($iSurveyID, $gid); - $aData['GidNext'] = $GidNext = getGidNext($iSurveyId, $gid); + $aData['GidNext'] = $GidNext = getGidNext($iSurveyID, $gid); $aData['iIconSize'] = Yii::app()->getConfig('adminthemeiconsize'); $aData['sImageURL'] = Yii::app()->getConfig('adminimageurl'); @@ -632,14 +632,14 @@ function _surveybar($iSurveyId, $gid=null) * @param int Survey id * @param string Action to be performed */ - function _surveysummary($iSurveyId, $action=null, $gid=null) + function _surveysummary($iSurveyID, $action=null, $gid=null) { $clang = $this->getController()->lang; - $baselang = Survey::model()->findByPk($iSurveyId)->language; - $condition = array('sid' => $iSurveyId, 'language' => $baselang); + $baselang = Survey::model()->findByPk($iSurveyID)->language; + $condition = array('sid' => $iSurveyID, 'language' => $baselang); - $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyId); //$sumquery1, 1) ; //Checked + $sumresult1 = Survey::model()->with(array('languagesettings'=>array('condition'=>'surveyls_language=language')))->findByPk($iSurveyID); //$sumquery1, 1) ; //Checked if (is_null($sumresult1)) { die('Invalid survey id'); @@ -650,20 +650,20 @@ function _surveysummary($iSurveyId, $action=null, $gid=null) //$surveyinfo = array_map('htmlspecialchars', $surveyinfo); $activated = $surveyinfo['active']; - $condition = array('sid' => $iSurveyId, 'parent_qid' => 0, 'language' => $baselang); + $condition = array('sid' => $iSurveyID, 'parent_qid' => 0, 'language' => $baselang); $sumresult3 = Questions::model()->findAllByAttributes($condition); //Checked $sumcount3 = count($sumresult3); - $condition = array('sid' => $iSurveyId, 'language' => $baselang); + $condition = array('sid' => $iSurveyID, 'language' => $baselang); - //$sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid={$iSurveyId} AND language='".$baselang."'"; //Getting a count of groups for this survey + //$sumquery2 = "SELECT * FROM ".db_table_name('groups')." WHERE sid={$iSurveyID} AND language='".$baselang."'"; //Getting a count of groups for this survey $sumresult2 = Groups::model()->findAllByAttributes($condition); //Checked $sumcount2 = count($sumresult2); //SURVEY SUMMARY - $aAdditionalLanguages = Survey::model()->findByPk($iSurveyId)->additionalLanguages; + $aAdditionalLanguages = Survey::model()->findByPk($iSurveyID)->additionalLanguages; $surveysummary2 = ""; if ($surveyinfo['anonymized'] != "N") { @@ -819,17 +819,17 @@ function _surveysummary($iSurveyId, $action=null, $gid=null) $aData['activated'] = $activated; if ($activated == "Y") { - $aData['surveydb'] = Yii::app()->db->tablePrefix . "survey_" . $iSurveyId; + $aData['surveydb'] = Yii::app()->db->tablePrefix . "survey_" . $iSurveyID; } $aData['warnings'] = ""; if ($activated == "N" && $sumcount3 == 0) { $aData['warnings'] = $clang->gT("Survey cannot be activated yet.") . "
\n"; - if ($sumcount2 == 0 && hasSurveyPermission($iSurveyId, 'surveycontent', 'create')) + if ($sumcount2 == 0 && hasSurveyPermission($iSurveyID, 'surveycontent', 'create')) { $aData['warnings'] .= "[" . $clang->gT("You need to add question groups") . "]
"; } - if ($sumcount3 == 0 && hasSurveyPermission($iSurveyId, 'surveycontent', 'create')) + if ($sumcount3 == 0 && hasSurveyPermission($iSurveyID, 'surveycontent', 'create')) { $aData['warnings'] .= "[" . $clang->gT("You need to add questions") . "]
"; } @@ -837,7 +837,7 @@ function _surveysummary($iSurveyId, $action=null, $gid=null) $aData['hints'] = $surveysummary2; //return (array('column'=>array($columns_used,$hard_limit) , 'size' => array($length, $size_limit) )); - // $aData['tableusage'] = getDBTableUsage($iSurveyId); + // $aData['tableusage'] = getDBTableUsage($iSurveyID); // ToDo: Table usage is calculated on every menu display which is too slow with bug surveys. // Needs to be moved to a database field and only updated if there are question/subquestions added/removed (it's currently also not functional due to the port) // @@ -869,17 +869,17 @@ function _surveysummary($iSurveyId, $action=null, $gid=null) /** * Browse Menu Bar */ - function _browsemenubar($iSurveyId, $title='') + function _browsemenubar($iSurveyID, $title='') { //BROWSE MENU BAR $aData['title'] = $title; - $aData['thissurvey'] = getSurveyInfo($iSurveyId); + $aData['thissurvey'] = getSurveyInfo($iSurveyID); $aData['sImageURL'] = Yii::app()->getConfig("adminimageurl"); $aData['clang'] = Yii::app()->lang; - $aData['surveyid'] = $iSurveyId; + $aData['surveyid'] = $iSurveyID; - $tmp_survlangs = Survey::model()->findByPk($iSurveyId)->additionalLanguages; - $baselang = Survey::model()->findByPk($iSurveyId)->language; + $tmp_survlangs = Survey::model()->findByPk($iSurveyID)->additionalLanguages; + $baselang = Survey::model()->findByPk($iSurveyID)->language; $tmp_survlangs[] = $baselang; rsort($tmp_survlangs); $aData['tmp_survlangs'] = $tmp_survlangs; diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php index 52fa4db0f7d..4b0abf135df 100644 --- a/application/helpers/admin/import_helper.php +++ b/application/helpers/admin/import_helper.php @@ -3534,7 +3534,7 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe } $insertdata['surveyls_description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_description']); $insertdata['surveyls_welcometext']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_welcometext']); - $insertdata['surveyls_urldescription']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_urldescription']); + if (isset($insertdata['surveyls_urldescription']))$insertdata['surveyls_urldescription']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_urldescription']); $insertdata['surveyls_email_invite']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_invite']); $insertdata['surveyls_email_remind']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_remind']); $insertdata['surveyls_email_register']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_register']); diff --git a/application/models/Conditions.php b/application/models/Conditions.php index 06c8d709088..1588d3ac7ca 100644 --- a/application/models/Conditions.php +++ b/application/models/Conditions.php @@ -60,14 +60,16 @@ public function primaryKey() * @access public * @return array */ - public function relatiosn() + public function relations() { return array( - 'question' => array(self::HAS_ONE, 'Questions', '', - 'on' => 't.cqid = question.qid', + 'questions' => array(self::HAS_ONE, 'Questions', '', + 'on' => 't.cqid = questions.qid', ), ); } + + public function deleteRecords($condition=FALSE) { $criteria = new CDbCriteria; @@ -83,13 +85,15 @@ public function deleteRecords($condition=FALSE) } else { - $criteria->where = $condition; + $criteria->addCondition($condition); } } return $this->deleteAll($criteria); } + + public function insertRecords($data, $update=FALSE, $condition=FALSE) { $record = new self;