Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
@TonisOrmisson
TonisOrmisson committed Jul 11, 2017
2 parents e46890c + fede438 commit 3722804
Show file tree
Hide file tree
Showing 84 changed files with 1,197 additions and 833 deletions.
2 changes: 1 addition & 1 deletion application/config/version.php
View file
Expand Up @@ -13,7 +13,7 @@

$config['versionnumber'] = '3.0.0-alpha'; //The current version of this branch
$config['masterversion'] = '2.62.2'; //The current masters version merged into this branch
$config['dbversionnumber'] = 293;
$config['dbversionnumber'] = 294;
$config['buildnumber'] = '';
$config['updatable'] = true;
$config['assetsversionnumber'] = '2671';
Expand Down
9 changes: 4 additions & 5 deletions application/controllers/admin/assessments.php
View file
Expand Up @@ -104,24 +104,23 @@ private function _showAssessments($iSurveyID, $action)
if ($action == "assessmentedit" && Permission::model()->hasSurveyPermission($iSurveyID, 'assessments', 'update')) {
$aData = $this->_collectEditData($aData);
}
$surveyinfo = getSurveyInfo($iSurveyID);
$aData['surveyinfo'] = $surveyinfo;
$aData['imageurl'] = Yii::app()->getConfig('adminimageurl');
$aData['surveyid'] = $iSurveyID;
$aData['headings'] = $aHeadings;
$aData['assessments'] = $oAssessments;
$aData['assessmentlangs'] = Yii::app()->getConfig("assessmentlangs");
$aData['baselang'] = $surveyinfo['language'];
$aData['baselang'] = $oSurvey->language;
$aData['action'] = $action;
$aData['subaction'] = gT("Assessments");
$aData['gid'] = empty($_POST['gid']) ? '' : sanitize_int($_POST['gid']);

Yii::app()->loadHelper('admin/htmleditor');

$urls['output'] = '<div class="side-body ' . getSideBodyClass(false) . '">';
$urls['output'] .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Assessments")), true, false);
//$urls['output'] .= App()->getController()->renderPartial('/admin/survey/breadcrumb', array('oSurvey'=>$oSurvey, 'active'=>gT("Assessments")), true, false);
$urls['output'] .= '<h3>'.gT("Assessments").'</h3>';
$aData['asessementNotActivated'] = false;
if ($surveyinfo['assessments']!='Y')
if ($oSurvey->assessments!='Y')
{
$aData['asessementNotActivated'] = array(
'title' => gT("Assessments mode not activated"),
Expand Down
6 changes: 4 additions & 2 deletions application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -95,6 +95,7 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
{
$request = Yii::app()->request;
$iSurveyID = sanitize_int($iSurveyID);
$survey = Survey::model()->findByPk($iSurveyID);
$this->iSurveyID = $iSurveyID;
$this->tokenTableExists = tableExists("{{tokens_$iSurveyID}}");
$this->tokenFieldsAndNames = getTokenFieldsAndNames($iSurveyID);
Expand All @@ -104,8 +105,9 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null)
Yii::app()->loadHelper("database");

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";

$aData['subaction'] = gT("Conditions designer");
$aData['questionbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$iSurveyID.'/gid/'.$gid.'/qid/'.$qid; // Close button
$aData['questionbar']['buttons']['conditions'] = TRUE;

Expand Down
8 changes: 5 additions & 3 deletions application/controllers/admin/database.php
View file
Expand Up @@ -1285,9 +1285,6 @@ private function actionInsertCopyQuestion($iSurveyID)

$this->iQuestionID=0;

/** @var Question $oOldQuestion */
$oOldQuestion = Question::model()->findByPk(returnGlobal('oldqid'));

$oQuestion= new Question;
$oQuestion->sid = $iSurveyID;
$oQuestion->gid = $this->iQuestionGroupID;
Expand Down Expand Up @@ -1362,6 +1359,11 @@ private function actionInsertCopyQuestion($iSurveyID)

} else {
if (Yii::app()->request->getPost('action') == 'copyquestion') {
/** @var Question $oOldQuestion */
$oldQID = returnGlobal('oldqid');
if($oldQID){
$oOldQuestion = Question::model()->findByPk($oldQID);
}
if (returnGlobal('copysubquestions') == 1) {
$aSQIDMappings = array();
$r1 = $oOldQuestion->subquestions;
Expand Down
6 changes: 4 additions & 2 deletions application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -30,6 +30,8 @@ class emailtemplates extends Survey_Common_Action {
function index($iSurveyId)
{
$iSurveyId = sanitize_int($iSurveyId);
$survey = Survey::model()->findByPk($iSurveyId);

Yii::app()->loadHelper('admin.htmleditor');
Yii::app()->loadHelper('surveytranslator');

Expand Down Expand Up @@ -70,8 +72,7 @@ function index($iSurveyId)
}

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyId.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyId.")";


$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand All @@ -84,6 +85,7 @@ function index($iSurveyId)
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyId; // Close button

$aData['surveyid'] = $iSurveyId;
$aData['subaction'] = gT("Edit email templates");
$aData['ishtml'] = $ishtml;
$aData['grplangs'] = $grplangs;
$this->_renderWrappedTemplate('emailtemplates', array('output' => $sEditScript, 'emailtemplates_view'), $aData);
Expand Down
31 changes: 11 additions & 20 deletions application/controllers/admin/export.php
View file
Expand Up @@ -129,8 +129,6 @@ public function exportresults()
$iSurveyID = sanitize_int(Yii::app()->request->getParam('surveyid'));
$survey = Survey::model()->findByPk($iSurveyID);

/** @var Survey $oSurvey */
$oSurvey = Survey::model()->findByPk($iSurveyID);

if ( ! isset($imageurl) ) { $imageurl = "./images"; }
if ( ! isset($iSurveyID) ) { $iSurveyID = returnGlobal('sid'); }
Expand Down Expand Up @@ -252,16 +250,14 @@ public function exportresults()
$aLanguages[$sLanguage]=getLanguageNameFromCode($sLanguage,false);
}
$data['aLanguages'] = $aLanguages; // Pass available exports
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;

$data['sidemenu']['state'] = false;
$data['menu']['edition'] = true;
$data['menu']['export'] = true;
$data['menu']['close'] = true;

$data['display']['menu_bars']['browse'] = gT('Browse responses'); // browse is independent of the above
$data["surveyinfo"] = $surveyinfo;
$data['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];
$data['title_bar']['title'] = gT('Browse responses').': '.$survey->currentLanguageSettings->surveyls_title;

$this->_renderWrappedTemplate('export', 'exportresults_view', $data);

Expand Down Expand Up @@ -354,6 +350,7 @@ public function exportspss()
{
global $length_vallabel;
$iSurveyID = sanitize_int(Yii::app()->request->getParam('sid'));
$oSurvey = Survey::model()->findByPk($iSurveyID);
//for scale 1=nominal, 2=ordinal, 3=scale

// $typeMap = $this->_getTypeMap();
Expand Down Expand Up @@ -420,11 +417,8 @@ public function exportspss()
$data['surveyid'] = $iSurveyID;
$data['display']['menu_bars']['browse'] = gT('Export results');

$oSurvey = Survey::model()->findByPk($iSurveyID);
$surveyinfo = $oSurvey->surveyinfo;
$data['display']['menu_bars']['browse'] = gT('Browse responses'); // browse is independent of the above
$data["surveyinfo"] = $surveyinfo;
$data['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];
$data['title_bar']['title'] = gT('Browse responses').': '.$oSurvey->currentLanguageSettings->surveyls_title;
$data['sBaseLanguage'] = $oSurvey->language;

$aLanguages=array();
Expand Down Expand Up @@ -693,10 +687,8 @@ public function vvexport()
$aData['uniquefieldcode']=(count(array_unique ($fieldcode))==count($fieldcode)); // Did we need more control ?
$aData['vvversionseleted']=($aData['uniquefieldcode'])?2:1;

$surveyinfo = $survey->surveyinfo;
$aData['display']['menu_bars']['browse'] = gT('Browse responses'); // browse is independent of the above
$aData["surveyinfo"] = $survey->surveyinfo;
$aData['title_bar']['title'] = gT('Browse responses').': '.$surveyinfo['surveyls_title'];
$aData['title_bar']['title'] = gT('Browse responses').': '.$survey->currentLanguageSettings->surveyls_title;

$aData['sidemenu']['state'] = false;
$aData['menu']['edition'] = true;
Expand Down Expand Up @@ -1057,6 +1049,8 @@ public function downloadZip($sZip)
*/
private function _exportarchive($iSurveyID, $bSendToBrowser=TRUE)
{
$survey = Survey::model()->findByPk($iSurveyID);

$aSurveyInfo = getSurveyInfo($iSurveyID);

$sTempDir = Yii::app()->getConfig("tempdir");
Expand All @@ -1076,22 +1070,19 @@ private function _exportarchive($iSurveyID, $bSendToBrowser=TRUE)

unlink($sLSSFileName);

if ( $aSurveyInfo['active'] == 'Y' )
{
if ( $survey->isActive) {
getXMLDataSingleTable($iSurveyID, 'survey_' . $iSurveyID, 'Responses', 'responses', $sLSRFileName, FALSE);
$this->_addToZip($zip, $sLSRFileName, 'survey_' . $iSurveyID . '_responses.lsr');
unlink($sLSRFileName);
}

if ( tableExists('{{tokens_' . $iSurveyID . '}}') )
{
if ( $survey->hasTokensTable ) {
getXMLDataSingleTable($iSurveyID, 'tokens_' . $iSurveyID, 'Tokens', 'tokens', $sLSTFileName);
$this->_addToZip($zip, $sLSTFileName, 'survey_' . $iSurveyID . '_tokens.lst');
unlink($sLSTFileName);
}

if ( tableExists('{{survey_' . $iSurveyID . '_timings}}') )
{
if ( $survey->hasTimingsTable ) {
getXMLDataSingleTable($iSurveyID, 'survey_' . $iSurveyID . '_timings', 'Timings', 'timings', $sLSIFileName);
$this->_addToZip($zip, $sLSIFileName, 'survey_' . $iSurveyID . '_timings.lsi');
unlink($sLSIFileName);
Expand Down Expand Up @@ -1248,6 +1239,7 @@ public function quexmlclear($iSurveyID)
public function quexml($iSurveyID)
{
$iSurveyID = (int) $iSurveyID;
$survey = Survey::model()->findByPk($iSurveyID);

$queXMLSettings = $this->_quexmlsettings();
$aData = array();
Expand All @@ -1256,8 +1248,7 @@ public function quexml($iSurveyID)
$aData['baselang'] = Survey::model()->findByPk($iSurveyID)->language;
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyID; // Close button
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";

array_unshift($aData['slangs'],$aData['baselang']);

Expand Down
5 changes: 3 additions & 2 deletions application/controllers/admin/expressions.php
View file
Expand Up @@ -44,9 +44,10 @@ function index()

if(isset($iSurveyID))
{
$survey = Survey::model()->findByPk($iSurveyID);

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";
if(Yii::app()->request->getQuery('gid')!='')
{
$aData['questiongroupbar']['closebutton']['url'] = $this->getController()->createUrl('admin/questiongroups/sa/view/',['surveyid'=> $surveyid, 'gid'=> sanitize_int(Yii::app()->request->getQuery('gid'))]);
Expand Down
3 changes: 1 addition & 2 deletions application/controllers/admin/index.php
View file
Expand Up @@ -31,8 +31,7 @@ public function run()
{
$aData['showLastSurvey'] = true;
$iSurveyID = $lastsurvey;
$surveyinfo = $survey->surveyinfo;
$aData['surveyTitle'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['surveyTitle'] = $survey->currentLanguageSettings->surveyls_title."(".gT("ID").":".$iSurveyID.")";
$aData['surveyUrl'] = $this->getController()->createUrl("admin/survey/sa/view/surveyid/{$iSurveyID}");
}
else
Expand Down
37 changes: 15 additions & 22 deletions application/controllers/admin/questiongroups.php
View file
Expand Up @@ -37,6 +37,7 @@ function import()
{
$action = $_POST['action'];
$iSurveyID = $surveyid = $aData['surveyid'] = (int)$_POST['sid'];
$survey = Survey::model()->findByPk($iSurveyID);

if (!Permission::model()->hasSurveyPermission($surveyid,'surveycontent','import'))
{
Expand Down Expand Up @@ -105,8 +106,7 @@ function import()
//$aData['display']['menu_bars']['surveysummary'] = 'importgroup';
$aData['sidemenu']['state'] = false;

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";

$this->_renderWrappedTemplate('survey/QuestionGroups', 'import_view', $aData);
}
Expand All @@ -119,6 +119,8 @@ function import()
function importView($surveyid)
{
$iSurveyID = $surveyid = sanitize_int($surveyid);
$survey = Survey::model()->findByPk($iSurveyID);

if (Permission::model()->hasSurveyPermission($surveyid,'surveycontent','import'))
{

Expand All @@ -132,9 +134,7 @@ function importView($surveyid)
$aData['surveybar']['savebutton']['text'] = gt('Import');
$aData['surveyid'] = $surveyid;


$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";

$this->_renderWrappedTemplate('survey/QuestionGroups', 'importGroup_view', $aData);
}
Expand All @@ -154,6 +154,7 @@ function add($surveyid)
{
/////
$iSurveyID = $surveyid = sanitize_int($surveyid);
$survey = Survey::model()->findByPk($iSurveyID);
$aViewUrls = $aData = array();

if (Permission::model()->hasSurveyPermission($surveyid, 'surveycontent', 'create'))
Expand All @@ -175,8 +176,7 @@ function add($surveyid)
$aData['baselang'] = $baselang;

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";
$aData['surveybar']['importquestiongroup'] = true;
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/listquestiongroups/surveyid/'.$surveyid; // Close button
$aData['surveybar']['savebutton']['form'] = true;
Expand Down Expand Up @@ -297,8 +297,9 @@ public function view($surveyid, $gid)
{
$aData = array();
$aData['surveyid'] = $iSurveyID = $surveyid;
$survey = Survey::model()->findByPk($iSurveyID);
$aData['gid'] = $gid;
$baselang = Survey::model()->findByPk($surveyid)->language;
$baselang = $survey->language;
$condarray = getGroupDepsForConditions($surveyid, "all", $gid, "by-targgid");
$aData['condarray'] = $condarray;

Expand All @@ -314,9 +315,7 @@ public function view($surveyid, $gid)

$aData['sidemenu']['questiongroups'] = true;
$aData['sidemenu']['group_name'] = $grow['group_name'];
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['surveyIsActive'] = $surveyinfo['active']=='Y';
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title." (".gT("ID").":".$iSurveyID.")";
$aData['questiongroupbar']['buttons']['view'] = true;

///////////
Expand All @@ -341,6 +340,7 @@ public function view($surveyid, $gid)
public function edit($surveyid, $gid)
{
$surveyid = $iSurveyID = sanitize_int($surveyid);
$survey = Survey::model()->findByPk($surveyid);
$gid = sanitize_int($gid);
$aViewUrls = $aData = array();

Expand Down Expand Up @@ -419,8 +419,7 @@ public function edit($surveyid, $gid)
$aData['tabtitles'] = $aTabTitles;
$aData['aBaseLanguage'] = $aBaseLanguage;

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $survey->currentLanguageSettings->surveyls_title.":".$iSurveyID.")";

///////////
// sidemenu
Expand Down Expand Up @@ -451,20 +450,14 @@ public function update($gid)
$gid = (int) $gid;
$group = QuestionGroup::model()->findByAttributes(array('gid' => $gid));
$surveyid = $group->sid;
$survey = Survey::model()->findByPk($surveyid);

if (Permission::model()->hasSurveyPermission($surveyid, 'surveycontent', 'update'))
{
Yii::app()->loadHelper('surveytranslator');

$grplangs = Survey::model()->findByPk($surveyid)->additionalLanguages;
$baselang = Survey::model()->findByPk($surveyid)->language;

array_push($grplangs, $baselang);

foreach ($grplangs as $grplang)
{
if (isset($grplang) && $grplang != "")
{
foreach ($survey->allLanguages as $grplang) {
if (isset($grplang) && $grplang != "") {
$group_name = $_POST['group_name_' . $grplang];
$group_description = $_POST['description_' . $grplang];

Expand Down

0 comments on commit 3722804

Please sign in to comment.