Skip to content

Commit

Permalink
Merge branch 'Yii' of github.com:LimeSurvey/LimeSurvey into Question_…
Browse files Browse the repository at this point in the history 
…Objects

Conflicts:
	application/controllers/admin/dataentry.php
	application/helpers/common_helper.php
	application/helpers/expressions/em_manager_helper.php
	application/helpers/qanda_helper.php
  • Loading branch information
@aaronschmitz
aaronschmitz committed Aug 15, 2012
2 parents 5b6d1cc + 7e49096 commit 1f117b6
Show file tree
Hide file tree
Showing 72 changed files with 382 additions and 246 deletions.
16 changes: 8 additions & 8 deletions application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -260,19 +260,19 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
// so we only need to db_quote _POST variables
if (isset($_POST['ConditionConst']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#CONST")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('ConditionConst'));
$posted_condition_value = Yii::app()->request->getPost('ConditionConst');
}
elseif (isset($_POST['prevQuestionSGQA']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#PREVQUESTIONS")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('prevQuestionSGQA'));
$posted_condition_value = Yii::app()->request->getPost('prevQuestionSGQA');
}
elseif (isset($_POST['tokenAttr']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#TOKENATTRS")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('tokenAttr'));
$posted_condition_value = Yii::app()->request->getPost('tokenAttr');
}
elseif (isset($_POST['ConditionRegexp']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#REGEXP")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('ConditionRegexp'));
$posted_condition_value = Yii::app()->request->getPost('ConditionRegexp');
}

if (isset($posted_condition_value))
Expand Down Expand Up @@ -330,19 +330,19 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
// so we only need to db_quote _POST variables
if (isset($_POST['ConditionConst']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#CONST")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('ConditionConst'));
$posted_condition_value = Yii::app()->request->getPost('ConditionConst');
}
elseif (isset($_POST['prevQuestionSGQA']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#PREVQUESTIONS")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('prevQuestionSGQA'));
$posted_condition_value = Yii::app()->request->getPost('prevQuestionSGQA');
}
elseif (isset($_POST['tokenAttr']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#TOKENATTRS")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('tokenAttr'));
$posted_condition_value = Yii::app()->request->getPost('tokenAttr');
}
elseif (isset($_POST['ConditionRegexp']) && isset($_POST['editTargetTab']) && $_POST['editTargetTab']=="#REGEXP")
{
$posted_condition_value = dbQuoteAll(Yii::app()->request->getPost('ConditionRegexp'));
$posted_condition_value = Yii::app()->request->getPost('ConditionRegexp');
}

if (isset($posted_condition_value))
Expand Down
5 changes: 2 additions & 3 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -746,9 +746,8 @@ public function delete()
*/
public function update()
{
$subaction = Yii::app()->request->getPost('subaction');
$surveyid = $_REQUEST['surveyid'];
if (!empty($_REQUEST['sid'])) $surveyid = (int)$_REQUEST['sid'];
$aData=array(); $subaction = Yii::app()->request->getPost('subaction');
if (isset($_REQUEST['surveyid'])) $surveyid = $_REQUEST['surveyid']; if (!empty($_REQUEST['sid'])) $surveyid = (int)$_REQUEST['sid'];
$surveyid = sanitize_int($surveyid);
$id = Yii::app()->request->getPost('id');
$lang = Yii::app()->request->getPost('lang');
Expand Down
12 changes: 7 additions & 5 deletions application/controllers/admin/participantsaction.php
View file
Expand Up @@ -1322,24 +1322,26 @@ function saveAttribute()

ParticipantAttributeNames::model()->saveAttributeLanguages($langdata);
}
if (Yii::app()->request->getPost('attribute_value_name_1'))
/* Create new attribute value */
if (Yii::app()->request->getPost('attribute_value_name_1') || Yii::app()->request->getPost('attribute_value_name_1') == "0")
{
$i = 1;
do
{
$attvaluename = 'attribute_value_name_' . $i;
if (!empty($_POST[$attvaluename]))
if ($_POST[$attvaluename] != "")
{
$aDatavalues[$i] = array(
'attribute_id' => $iAttributeId,
'value' => Yii::app()->request->getPost($attvaluename)
);
}
$i++;
} while (isset($_POST[$attvaluename]));
} while ($_POST[$attvaluename] != "");
ParticipantAttributeNames::model()->storeAttributeValues($aDatavalues);
}
if (Yii::app()->request->getPost('editbox'))
/* Save updated attribute values */
if (Yii::app()->request->getPost('editbox') || Yii::app()->request->getPost('editbox')=="0")
{
$editattvalue = array(
'attribute_id' => $iAttributeId,
Expand Down Expand Up @@ -1367,7 +1369,7 @@ function delAttributeValues()
*/
function editAttributevalue()
{
if (Yii::app()->request->getPost('oper') == "edit" && Yii::app()->request->getPost('attvalue'))
if (Yii::app()->request->getPost('oper') == "edit" && (Yii::app()->request->getPost('attvalue') || Yii::app()->request->getPost('attvalue')=="0"))
{
$iAttributeId = explode("_", Yii::app()->request->getPost('id'));
$aData = array('participant_id' => Yii::app()->request->getPost('participant_id'), 'attribute_id' => $iAttributeId[1], 'value' => Yii::app()->request->getPost('attvalue'));
Expand Down
28 changes: 8 additions & 20 deletions application/controllers/admin/responses.php
View file
Expand Up @@ -181,9 +181,9 @@ public function view($iSurveyId, $iId, $sBrowseLang = '')
{
$oCriteria = Survey_dynamic::model($iSurveyId)->addTokenCriteria($oCriteria);
}
if (incompleteAnsFilterState() == 'inc')
if (incompleteAnsFilterState() == 'incomplete')
$oCriteria->addCondition('submitdate = ' . mktime(0, 0, 0, 1, 1, 1980) . ' OR submitdate IS NULL');
elseif (incompleteAnsFilterState() == 'filter')
elseif (incompleteAnsFilterState() == 'complete')
$oCriteria->addCondition('submitdate >= ' . mktime(0, 0, 0, 1, 1, 1980));
if ($iId < 1)
{
Expand Down Expand Up @@ -518,11 +518,11 @@ function browse($iSurveyId)
$oCriteria = Survey_dynamic::model($iSurveyId)->addTokenCriteria($oCriteria);
}

if (incompleteAnsFilterState() == "inc")
if (incompleteAnsFilterState() == "incomplete")
{
$oCriteria->addCondition("`submitdate` IS NULL");
}
elseif (incompleteAnsFilterState() == "filter")
elseif (incompleteAnsFilterState() == "complete")
{
$oCriteria->addCondition("`submitdate` IS NOT NULL");
}
Expand Down Expand Up @@ -569,6 +569,8 @@ function browse($iSurveyId)
}

$aData['dtcount2'] = $dtcount2;
$aData['sCompletionStateValue']=incompleteAnsFilterState();

$aData['start'] = $start;
$aData['limit'] = $limit;
$aData['last'] = $last;
Expand Down Expand Up @@ -599,6 +601,7 @@ function browse($iSurveyId)
$aViewUrls[] = 'browseallfooter_view';
$this->_renderWrappedTemplate('',$aViewUrls, $aData);
}

public function time($iSurveyId)
{
$aData = $this->_getData(array('iSurveyId' => $iSurveyId));
Expand Down Expand Up @@ -708,22 +711,7 @@ public function time($iSurveyId)
$end = 0;
}

$selectshow = '';
$selectinc = '';
$selecthide = '';

if (incompleteAnsFilterState() == "inc")
{
$selectinc = " selected='selected'";
}
elseif (incompleteAnsFilterState() == "filter")
{
$selecthide = " selected='selected'";
}
else
{
$selectshow = " selected='selected'";
}
$aData['sCompletionStateValue']=incompleteAnsFilterState();
$aData['start'] = $start;
$aData['limit'] = $limit;
$aData['last'] = $last;
Expand Down
12 changes: 6 additions & 6 deletions application/helpers/admin/import_helper.php
View file
Expand Up @@ -3531,13 +3531,13 @@ function XMLImportSurvey($sFullFilepath,$sXMLdata=NULL,$sNewSurveyName=NULL,$iDe
} else {
$insertdata['surveyls_title']=translateLinks('survey', $iOldSID, $iNewSID, $sNewSurveyName);
}
$insertdata['surveyls_description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_description']);
$insertdata['surveyls_welcometext']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_welcometext']);
if (isset($insertdata['surveyls_description'])) $insertdata['surveyls_description']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_description']);
if (isset($insertdata['surveyls_welcometext'])) $insertdata['surveyls_welcometext']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_welcometext']);
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']);
$insertdata['surveyls_email_confirm']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_confirm']);
if (isset($insertdata['surveyls_email_invite'])) $insertdata['surveyls_email_invite']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_invite']);
if (isset($insertdata['surveyls_email_remind'])) $insertdata['surveyls_email_remind']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_remind']);
if (isset($insertdata['surveyls_email_register'])) $insertdata['surveyls_email_register']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_register']);
if (isset($insertdata['surveyls_email_confirm'])) $insertdata['surveyls_email_confirm']=translateLinks('survey', $iOldSID, $iNewSID, $insertdata['surveyls_email_confirm']);
}


Expand Down
3 changes: 1 addition & 2 deletions application/helpers/common_helper.php
View file
Expand Up @@ -3914,7 +3914,6 @@ function CSVUnquote($field)

function incompleteAnsFilterState()
{
global $filterout_incomplete_answers;
$letsfilter='';
$letsfilter = returnGlobal('completionstate'); //read get/post completionstate

Expand All @@ -3926,7 +3925,7 @@ function incompleteAnsFilterState()
}
elseif (empty(Yii::app()->session['incompleteanswers']))
{ // sets default variable value from config file
Yii::app()->session['incompleteanswers'] = $filterout_incomplete_answers;
Yii::app()->session['incompleteanswers'] = Yii::app()->getConfig('filterout_incomplete_answers');
}

if (Yii::app()->session['incompleteanswers']=='complete' || Yii::app()->session['incompleteanswers']=='all' || Yii::app()->session['incompleteanswers']=='incomplete') {
Expand Down
9 changes: 9 additions & 0 deletions application/helpers/qanda_helper.php
View file
Expand Up @@ -272,6 +272,7 @@ function return_timer_script($aQuestionAttributes, $q, $disable=null) {
{
$_SESSION['survey_'.Yii::app()->getConfig('surveyID')]['questions'] = array();
}

/* End */

if(isset($thissurvey['timercount']))
Expand Down Expand Up @@ -400,6 +401,14 @@ function countdown(questionid,timer,action,warning,warning2,warninghide,warning2
action = 3;";
}
}

/* If this is a preview, don't allow the page to submit/reload */
$thisaction=returnglobal('action');
if($thisaction == "previewquestion" || $thisaction == "previewgroup") {
$output .="
action = 3;";
}

$output .="
var timerdisplay='LS_question'+questionid+'_Timer';
var warningtimedisplay='LS_question'+questionid+'_Warning';
Expand Down
2 changes: 1 addition & 1 deletion application/models/ParticipantAttributeNames.php
View file
Expand Up @@ -396,7 +396,7 @@ function saveAttributeLanguages($data)

function storeAttributeValues($data)
{
foreach ($data as $record) {
foreach ($data as $record) {
Yii::app()->db->createCommand()->insert('{{participant_attribute_values}}',$record);
}
}
Expand Down
5 changes: 3 additions & 2 deletions application/modules/RankingQuestion.php
View file
Expand Up @@ -67,6 +67,7 @@ public function getAnswerHTML()
$answer .="</ul>"
. "<div style='display:none' id='ranking-{$this->id}-maxans'>{".$max_answers."}</div>"
. "<div style='display:none' id='ranking-{$this->id}-minans'>{".$min_answers."}</div>"
. "<div style='display:none' id='ranking-{$ia[0]}-name'>javatb".$this->fieldname."</div>"
. "</div>";
// The list with HTML answres
$answer .="<div style=\"display:none\">";
Expand Down Expand Up @@ -288,7 +289,7 @@ protected function getAnswers()
public function getHeaderIncludes()
{

return array('ranking.js' => 'js', 'ranking.css' => 'css');
return array('ranking.js' => 'js', 'jquery/jquery.actual/jquery.actual.min.js' => 'js', 'ranking.css' => 'css');
}

public function createFieldmap()
Expand Down Expand Up @@ -447,7 +448,7 @@ public function getValueJS()

public function availableAttributes($attr = false)
{
$attrs=array("statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","showpopups","samechoiceheight","samelistheight", "parent_order","rank_title","choice_title","random_group");
$attrs=array("array_filter","array_filter_exclude","array_filter_style","statistics_showgraph","statistics_graphtype","hide_tip","hidden","max_answers","min_answers","page_break","public_statistics","random_order","showpopups","samechoiceheight","samelistheight", "parent_order","rank_title","choice_title","random_group");
return $attr?in_array($attr,$attrs):$attrs;
}

Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/participants/attributeMapToken_view.php
View file
Expand Up @@ -2,7 +2,7 @@
<link rel="stylesheet" type="text/css" href="<?php echo Yii::app()->getConfig('adminstyleurl') . "attributeMapToken.css" ?>" />
<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.js" ?>" type="text/javascript"></script>
<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery-ui.js" ?>" type="text/javascript"></script>
<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.ui.sortable.js" ?>" type="text/javascript"></script>
<script src="<?php echo Yii::app()->getConfig('generalscripts') . "jquery/jquery.ui.nestedSortable.js" ?>" type="text/javascript"></script>
<script src="<?php echo Yii::app()->getConfig('adminscripts') . "attributeMapToken.js" ?>" type="text/javascript"></script>
<script type="text/javascript">
var redUrl = "<?php echo Yii::app()->baseUrl . "/index.php/admin/participants/displayParticipants"; ?>";
Expand Down Expand Up @@ -89,7 +89,7 @@
</p>
<?php
$ajaxloader = array(
'src' => Yii::app()->baseUrl . '/images/ajax-loader.gif',
'src' => Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif',
'alt' => 'Ajax Loader',
'title' => 'Ajax Loader'
);
Expand Down
4 changes: 2 additions & 2 deletions application/views/admin/participants/attributeMap_view.php
View file
Expand Up @@ -107,7 +107,7 @@
</p>
<?php
$ajaxloader = array(
'src' => Yii::app()->baseUrl . '/images/ajax-loader.gif',
'src' => Yii::app()->getConfig('adminimageurl') . '/ajax-loader.gif',
'alt' => 'Ajax loader',
'title' => 'Ajax loader'
);
Expand All @@ -117,4 +117,4 @@
</div>

</body>
</html>
</html>
2 changes: 1 addition & 1 deletion application/views/admin/participants/displayParticipants_view.php
View file
Expand Up @@ -153,7 +153,7 @@
var shareUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/shareParticipants"); ?>";
var surveyUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/addToToken"); ?>";
var postUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/setSession"); ?>";
var ajaxUrl = "<?php echo Yii::app()->getController()->createUrl("images/ajax-loader.gif"); ?>";
var ajaxUrl = "<?php echo Yii::app()->getConfig('adminimageurl') . "/ajax-loader.gif" ?>";
var redUrl = "<?php echo Yii::app()->getController()->createUrl("admin/participants/displayParticipants"); ?>";
var colNames = '["participant_id","can_edit","<?php $clang->eT("First name") ?>","<?php $clang->eT("Last name") ?>","<?php $clang->eT("Email") ?>","<?php $clang->eT("Blacklisted") ?>","<?php $clang->eT("Surveys") ?>","<?php $clang->eT("Language") ?>","<?php $clang->eT("Owner name") ?>"<?php echo $columnNames; ?>]';
var colModels = '[{ "name":"participant_id", "index":"participant_id", "width":100, "align":"center", "sorttype":"int", "sortable": true, "editable":false, "hidden":true},';
Expand Down
9 changes: 4 additions & 5 deletions application/views/admin/responses/browseallheader_view.php
View file
Expand Up @@ -46,11 +46,10 @@
<?php $clang->eT("Records displayed:"); ?><input type='text' size='4' value='<?php echo $dtcount2; ?>' name='limit' id='limit' />
&nbsp;&nbsp; <?php $clang->eT("Starting from:"); ?><input type='text' size='4' value='<?php echo $start; ?>' name='start' id='start' />
&nbsp;&nbsp; <input type='submit' value='<?php $clang->eT("Show"); ?>' />
&nbsp;&nbsp; <?php $clang->eT("Display:"); ?> <select name='completionstate' onchange='javascript:submit();'>
<option value='show' <?php echo $selectshow; ?>><?php $clang->eT("All responses"); ?></option>
<option value='filter' <?php echo $selecthide; ?>><?php $clang->eT("Completed responses only"); ?></option>
<option value='incomplete' <?php echo $selectinc; ?>><?php $clang->eT("Incomplete responses only"); ?></option>
</select>
&nbsp;&nbsp; <?php $clang->eT("Display:"); ?>
<?php echo CHtml::dropDownList('completionstate',$sCompletionStateValue,array('all'=> $clang->gT("All responses"),
'complete'=> $clang->gT("Completed responses only"),
'incomplete'=> $clang->gT("Incomplete responses only")),array('onchange'=>'javascript:submit();')); ?>
<input type='hidden' name='sid' value='<?php echo $surveyid; ?>' />
<input type='hidden' name='action' value='browse' />
<input type='hidden' name='subaction' value='all' />
Expand Down
8 changes: 7 additions & 1 deletion application/views/admin/survey/subview/tabGeneralNewSurvey_view.php
View file
Expand Up @@ -19,15 +19,21 @@
<input type='text' size='82' maxlength='200' id='surveyls_title' name='surveyls_title' required="required" autofocus="autofocus" /> <span class='annotation'><?php $clang->eT("Required"); ?> </span>
</li>
<li><label for='description'><?php $clang->eT("Description:"); ?> </label>
<div class='htmleditor'>
<textarea cols='80' rows='10' id='description' name='description'></textarea>
</div>
<?php echo getEditor("survey-desc", "description", "[" . $clang->gT("Description:", "js") . "]", '', '', '', $action); ?>
</li>
<li><label for='welcome'><?php $clang->eT("Welcome message:"); ?> </label>
<div class='htmleditor'>
<textarea cols='80' rows='10' id='welcome' name='welcome'></textarea>
<?php echo getEditor("survey-welc", "welcome", "[" . $clang->gT("Welcome message:", "js") . "]", '', '', '', $action) ?>
</div>
</li>
<li><label for='endtext'><?php $clang->eT("End message:") ;?> </label>
<div class='htmleditor'>
<textarea cols='80' id='endtext' rows='10' name='endtext'></textarea>
</div>
<?php echo getEditor("survey-endtext", "endtext", "[" . $clang->gT("End message:", "js") . "]", '', '', '', $action) ?>
</li>

Expand Down Expand Up @@ -64,4 +70,4 @@
<li><label for='faxto'><?php $clang->eT("Fax to:") ; ?></label>
<input type='text' size='50' id='faxto' name='faxto' /></li>
</ul>
</div>
</div>

0 comments on commit 1f117b6

Please sign in to comment.