Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/LimeSurvey/LimeSurvey
Browse files Browse the repository at this point in the history
  • Loading branch information
@mennodekker
mennodekker committed Nov 30, 2012
2 parents 1790194 + 6d89157 commit 51436c4
Show file tree
Hide file tree
Showing 96 changed files with 336 additions and 301 deletions.
2 changes: 1 addition & 1 deletion application/controllers/AdminController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public function run($action)

Yii::app()->session['redirectopage'] = Yii::app()->request->requestUri;

$this->redirect($this->createUrl('/admin/authentication/login'));
$this->redirect($this->createUrl('/admin/authentication/sa/login'));
}

return parent::run($action);
Expand Down
14 changes: 7 additions & 7 deletions application/controllers/admin/conditionsaction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
if (!isset($_GET['ok']))
{
$button_yes = CHtml::submitButton($clang->gT("Yes"), array(
'onclick' => "window.open('".$this->getController()->createUrl("admin/conditions/index/subaction/resetsurveylogic/surveyid/$iSurveyID")."?ok=Y"."', '_top')"
'onclick' => "window.open('".$this->getController()->createUrl("admin/conditions/sa/index/subaction/resetsurveylogic/surveyid/$iSurveyID")."?ok=Y"."', '_top')"
));
$button_cancel = CHtml::submitButton($clang->gT("Cancel"), array(
'onclick' => "window.open('".$this->getController()->createUrl("admin/survey/sa/view/surveyid/$iSurveyID")."', '_top')"
Expand Down Expand Up @@ -1037,7 +1037,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
}

$questionNavOptions .= CHtml::tag('option', array(
'value' => $this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
$questionselecter
);
}
Expand All @@ -1055,7 +1055,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
}

$questionNavOptions .= CHtml::tag('option', array(
'value'=>$this->getController()->createUrl("/admin/conditions/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/$gid/qid/$qid"),
'value'=>$this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/$gid/qid/$qid"),
'selected'=>'selected'),
$questiontitle .': '. $questiontextshort);
$questionNavOptions .= CHtml::closeTag('optgroup');
Expand All @@ -1075,7 +1075,7 @@ function index($subaction, $iSurveyID=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/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
'value' => $this->getController()->createUrl("/admin/conditions/sa/index/subaction/editconditionsform/surveyid/$iSurveyID/gid/{$row['gid']}/qid/{$row['qid']}")),
$row['title'].':'.$questionselecter
);
}
Expand Down Expand Up @@ -1363,7 +1363,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
}

$aViewUrls['output'] .= "\t<tr class='{$markcidstyle}'>\n"
."\t<td colspan='2'><form style='margin-bottom:0;' name='conditionaction{$rows['cid']}' id='conditionaction{$rows['cid']}' method='post' action='".$this->getController()->createUrl("/admin/conditions/index/subaction/$subaction/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."'>\n"
."\t<td colspan='2'><form style='margin-bottom:0;' name='conditionaction{$rows['cid']}' id='conditionaction{$rows['cid']}' method='post' action='".$this->getController()->createUrl("/admin/conditions/sa/index/subaction/$subaction/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."'>\n"
."<table>\n"
."\t<tr>\n";

Expand Down Expand Up @@ -1594,7 +1594,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
if ($subaction == "copyconditionsform" || $subaction == "copyconditions")
{
$aViewUrls['output'] .= "<tr class=''><td colspan='3'>\n"
."<form action='".$this->getController()->createUrl("admin/conditions/index/subaction/copyconditions/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."' name='copyconditions' id='copyconditions' method='post'>\n";
."<form action='".$this->getController()->createUrl("admin/conditions/sa/index/subaction/copyconditions/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."' name='copyconditions' id='copyconditions' method='post'>\n";

$aViewUrls['output'] .= "<div class='header ui-widget-header'>".$clang->gT("Copy conditions")."</div>\n";

Expand Down Expand Up @@ -1698,7 +1698,7 @@ function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
$subaction == "updatescenario" ||
$subaction == "editthiscondition" || $subaction == "delete")
{
$aViewUrls['output'] .= "<form action='".$this->getController()->createUrl("/admin/conditions/index/subaction/$subaction/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."' name='editconditions' id='editconditions' method='post'>\n";
$aViewUrls['output'] .= "<form action='".$this->getController()->createUrl("/admin/conditions/sa/index/subaction/$subaction/surveyid/$iSurveyID/gid/$gid/qid/$qid/")."' name='editconditions' id='editconditions' method='post'>\n";
if ($subaction == "editthiscondition" && isset($p_cid))
{
$mytitle = $clang->gT("Edit condition");
Expand Down
6 changes: 3 additions & 3 deletions application/controllers/admin/database.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,7 @@ function index($sa = null)
}
else
{
$this->getController()->redirect($this->getController()->createUrl('/admin/question/answeroptions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
$this->getController()->redirect($this->getController()->createUrl('/admin/question/sa/answeroptions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
}

//$action='editansweroptions';
Expand Down Expand Up @@ -356,7 +356,7 @@ function index($sa = null)
}
else
{
$this->getController()->redirect($this->getController()->createUrl('/admin/question/subquestions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
$this->getController()->redirect($this->getController()->createUrl('/admin/question/sa/subquestions/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
}
}

Expand Down Expand Up @@ -878,7 +878,7 @@ function index($sa = null)
else
{
if(Yii::app()->request->getPost('newpage') == "return") {
$this->getController()->redirect($this->getController()->createUrl('admin/question/editquestion/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
$this->getController()->redirect($this->getController()->createUrl('admin/question/sa/editquestion/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
} else {
$this->getController()->redirect($this->getController()->createUrl('admin/survey/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid));
}
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/dataentry.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ function import($surveyid)
}
Yii::app()->session['flashmessage'] = sprintf($clang->gT("%s old response(s) and according timings were successfully imported."),$iRecordCount,$iRecordCountT);
}
$this->getController()->redirect(Yii::app()->getController()->createUrl("/admin/responses/index/surveyid/{$surveyid}"));
$this->getController()->redirect(Yii::app()->getController()->createUrl("/admin/responses/sa/index/surveyid/{$surveyid}"));
}
}
}
Expand Down
21 changes: 16 additions & 5 deletions application/controllers/admin/participantsaction.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,17 @@ function subval_sort($a, $subkey, $order)
*/
class participantsaction extends Survey_Common_Action
{
public function runWithParams($params)
{
if (!hasGlobalPermission('USER_RIGHT_PARTICIPANT_PANEL'))
{
die('No permission');
}
parent::runWithParams($params);
}



/**
* Loads jqGrid for the view
* @param string $sScript Subaction
Expand Down Expand Up @@ -475,7 +486,7 @@ function storeUserControlValues()
$stg ->stg_value=Yii::app()->request->getPost('userideditable');
$stg->save();
}
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/userControl'));
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/userControl'));
}

/**
Expand All @@ -498,7 +509,7 @@ function storeBlacklistValues()
$stg->save();
}
}
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/blacklistControl'));
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/blacklistControl'));
}

/**
Expand Down Expand Up @@ -527,7 +538,7 @@ function getSurveyInfo_json()
$surveylink = $row['survey_id'];
} else
{
$surveylink = '<a href=' . Yii::app()->getController()->createUrl("/admin/tokens/browse/surveyid/{$row['survey_id']}") . '>' . $row['survey_id'].'</a>';
$surveylink = '<a href=' . Yii::app()->getController()->createUrl("/admin/tokens/sa/browse/surveyid/{$row['survey_id']}") . '>' . $row['survey_id'].'</a>';
}
$aData->rows[$i]['cell'] = array($surveyname[0]['surveyls_title'], $surveylink, $row['token_id'], $row['date_created'], $row['date_invited'], $row['date_completed']);
$i++;
Expand Down Expand Up @@ -1144,7 +1155,7 @@ function saveAttribute()
);
ParticipantAttributeNames::model()->saveAttributeValue($editattvalue);
}
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/attributeControl'));
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('admin/participants/sa/attributeControl'));
}

/*
Expand All @@ -1155,7 +1166,7 @@ function delAttributeValues()
$iAttributeId = Yii::app()->request->getQuery('aid');
$iValueId = Yii::app()->request->getQuery('vid');
ParticipantAttributeNames::model()->delAttributeValues($iAttributeId, $iValueId);
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('/admin/participants/viewAttribute/aid/' . $iAttributeId));
Yii::app()->getController()->redirect(Yii::app()->getController()->createUrl('/admin/participants/sa/viewAttribute/aid/' . $iAttributeId));
}

/*
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/question.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -873,7 +873,7 @@ public function delete($surveyid, $gid, $qid)
if (isset($qidarray))
$qidlist = implode(", ", $qidarray);
$message =$clang->gT("Question could not be deleted. There are conditions for other questions that rely on this question. You cannot delete this question until those conditions are removed.");
$message .="<br /><a href='". $this->getController()->createUrl("admin/expressions/survey_logic_file/sid/{$surveyid}")."' >".$clang->gT("Look at survey logic files")."</a>.";
$message .="<br /><a href='". $this->getController()->createUrl("admin/expressions/sa/survey_logic_file/sid/{$surveyid}")."' >".$clang->gT("Look at survey logic files")."</a>.";
$this->getController()->error(
$message,
$this->getController()->createUrl("admin/survey/sa/view/surveyid/{$surveyid}/gid/{$gid}/qid/{$qid}")
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/quotas.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ private function _checkPermissions($iSurveyId, $sPermission)

function _redirectToIndex($iSurveyId)
{
$this->getController()->redirect($this->getController()->createUrl("/admin/quotas/index/surveyid/$iSurveyId"));
$this->getController()->redirect($this->getController()->createUrl("/admin/quotas/sa/index/surveyid/$iSurveyId"));
}

function index($iSurveyId, $quickreport = false)
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/responses.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ public function view($iSurveyID, $iId, $sBrowseLang = '')
if ($metadata === "size")
$answervalue = rawurldecode(((int) ($phparray[$index][$metadata])) . " KB");
else if ($metadata === "name")
$answervalue = CHtml::link(rawurldecode($phparray[$index][$metadata]), $this->getController()->createUrl("/admin/responses/index/downloadindividualfile/{$phparray[$index][$metadata]}/fieldname/{$fnames[$i][0]}/id/{$iId}/surveyid/{$iSurveyID}"));
$answervalue = CHtml::link(rawurldecode($phparray[$index][$metadata]), $this->getController()->createUrl("/admin/responses/sa/index/downloadindividualfile/{$phparray[$index][$metadata]}/fieldname/{$fnames[$i][0]}/id/{$iId}/surveyid/{$iSurveyID}"));
else
$answervalue = rawurldecode($phparray[$index][$metadata]);
}
Expand Down
16 changes: 14 additions & 2 deletions application/controllers/admin/statistics.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -509,8 +509,20 @@ function listcolumn($surveyid, $column, $sortby="", $sortmethod="", $sorttype=""
}
}

if($sorttype=='N') {$sortby = "($sortby * 1)";} //Converts text sorting into numerical sorting
if($sortby != "") $search['order']=$sortby.' '.$sortmethod;
if ($sortby!='')
{
if ($sDBDriverName=='sqlsrv' || $sDBDriverName=='mssql')
{
$sortby="CAST(".Yii::app()->db->quoteColumnName($sortby)." as varchar)";
}
else
{
$sortby=Yii::app()->db->quoteColumnName($sortby);
}

if($sorttype=='N') {$sortby = "($sortby * 1)";} //Converts text sorting into numerical sorting
$search['order']=$sortby.' '.$sortmethod;
}
$results=Survey_dynamic::model($surveyid)->findAll($search);
$output=array();
foreach($results as $row) {
Expand Down
4 changes: 2 additions & 2 deletions application/controllers/admin/surveyadmin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -483,13 +483,13 @@ public function activate($iSurveyID)
if ($survey->allowregister=='Y')
{
$aViewUrls['output'] .= $clang->gT("This survey allows public registration. A token table must also be created.")."<br /><br />\n"
."<input type='submit' value='".$clang->gT("Initialise tokens")."' onclick=\"".convertGETtoPOST(Yii::app()->getController()->createUrl("admin/tokens/index/surveyid/".$iSurveyID))."\" />\n";
."<input type='submit' value='".$clang->gT("Initialise tokens")."' onclick=\"".convertGETtoPOST(Yii::app()->getController()->createUrl("admin/tokens/sa/index/surveyid/".$iSurveyID))."\" />\n";
}
else
{
$aViewUrls['output'] .= $clang->gT("This survey is now active, and responses can be recorded.")."<br /><br />\n"
."<strong>".$clang->gT("Open-access mode").":</strong> ".$clang->gT("No invitation code is needed to complete the survey.")."<br />".$clang->gT("You can switch to the closed-access mode by initialising a token table with the button below.")."<br /><br />\n"
."<input type='submit' value='".$clang->gT("Switch to closed-access mode")."' onclick=\"".convertGETtoPOST(Yii::app()->getController()->createUrl("admin/tokens/index/surveyid/".$iSurveyID))."\" />\n"
."<input type='submit' value='".$clang->gT("Switch to closed-access mode")."' onclick=\"".convertGETtoPOST(Yii::app()->getController()->createUrl("admin/tokens/sa/index/surveyid/".$iSurveyID))."\" />\n"
."<input type='submit' value='".$clang->gT("No, thanks.")."' onclick=\"".convertGETtoPOST(Yii::app()->getController()->createUrl("admin/survey/sa/view/surveyid/".$iSurveyID))."\" />\n";
}
$aViewUrls['output'] .= "</div><br />&nbsp;\n";
Expand Down

0 comments on commit 51436c4

Please sign in to comment.