Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into develop
Browse files Browse the repository at this point in the history 
Conflicts:
	application/controllers/survey/index.php
	application/libraries/PluginManager/PluginBase.php
  • Loading branch information
@olleharstedt
olleharstedt committed Feb 17, 2017
2 parents d06f777 + 18f6b52 commit 3981fea
Show file tree
Hide file tree
Showing 54 changed files with 763 additions and 662 deletions.
27 changes: 25 additions & 2 deletions application/commands/PluginCommand.php
View file
@@ -1,9 +1,9 @@
<?php
/*
* LimeSurvey (tm)
* Copyright (C) 2011 The LimeSurvey Project Team / Carsten Schmitz
* Copyright (C) 2011-2017 The LimeSurvey Project Team / Carsten Schmitz
* All rights reserved.
* License: GNU/GPL License v2 or later, see LICENSE.php
* License: GNU/GPL License v3 or later, see LICENSE.php
* LimeSurvey is free software. This version may have been modified pursuant
* to the GNU General Public License, and as distributed it includes or
* is derivative of works licensed under the GNU General Public License or
Expand All @@ -15,13 +15,36 @@ class PluginCommand extends CConsoleCommand
{
public $connection;

/**
* Call for cron action
* @interval int $interval Minutes for interval
* @return void
*/
public function actionCron($interval=null)
{
$pm = \Yii::app()->pluginManager;
$event = new PluginEvent('cron');
$event->set('interval', $interval);
$pm->dispatchEvent($event);
}

/**
* Call directly an event by command (it's default)
* @param string $target Target of action, plugin name for example
* @param mixed $function Extra parameters for plugin
* @param mixed $option Extra parameters for plugin
* @return void
*/
public function actionIndex($target, $function=null,$option=null)
{
$pm = \Yii::app()->pluginManager;
$event = new PluginEvent('direct');
$event->set('target', $target);
$event->set('function', $function);
$event->set('option', $option);
$pm->dispatchEvent($event);
}

}

?>
2 changes: 1 addition & 1 deletion application/controllers/admin/PluginHelper.php
View file
Expand Up @@ -23,7 +23,7 @@ public function sidebody($surveyId, $plugin, $method)
$aData['surveyid'] = $surveyId;

$aData['surveybar']['buttons']['view']= true;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyId.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$surveyId.")";

$content = $this->getContent($surveyId, $plugin, $method);

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/assessments.php
View file
Expand Up @@ -79,7 +79,7 @@ protected function _renderWrappedTemplate($sAction = 'assessments', $aViewUrls =
$iSurveyID=$aData['surveyid'];
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['surveybar']['closebutton']['url'] = 'admin/survey/sa/view/surveyid/'.$iSurveyID; // Close button
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['surveybar']['savebutton']['form'] = true;
$aData['surveybar']['saveandclosebutton']['form'] = true;
$aData['gid']=null;
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/conditionsaction.php
View file
Expand Up @@ -105,7 +105,7 @@ public function index($subaction, $iSurveyID=null, $gid=null, $qid=null)

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['questionbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$iSurveyID.'/gid/'.$gid.'/qid/'.$qid; // Close button
$aData['questionbar']['buttons']['conditions'] = TRUE;

Expand Down
5 changes: 3 additions & 2 deletions application/controllers/admin/dataentry.php
View file
Expand Up @@ -1917,8 +1917,9 @@ public function insert()
$message .= gT("Reload your survey by clicking on the following link (or pasting it into your browser):")."\n";
$aParams=array('lang'=>$saver['language'],'loadname'=>$saver['identifier'],'loadpass'=>$saver['password']);
if (isset($tokendata['token'])) { $aParams['token']= $tokendata['token']; }
$message .= Yii::app()->getController()->createAbsoluteUrl("/survey/index/sid/{$iSurveyID}/loadall/reload/scid/{$scid}/",$aParams);
$from = $thissurvey['adminemail'];
$message .= Yii::app()->getController()->createAbsoluteUrl("/survey/index/sid/{$surveyid}/loadall/reload/scid/{$scid}/",$aParams);
$from = $thissurvey['adminemail'];
$sitename = Yii::app()->getConfig('sitename');
if (SendEmailMessage($message, $subject, $saver['email'], $from, $sitename, false, getBounceEmail($surveyid)))
{
$emailsent="Y";
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/emailtemplates.php
View file
Expand Up @@ -71,7 +71,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'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyId.")";


$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/export.php
View file
Expand Up @@ -1230,7 +1230,7 @@ public function quexml($iSurveyID)
$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'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";

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

Expand Down
2 changes: 1 addition & 1 deletion application/controllers/admin/expressions.php
View file
Expand Up @@ -46,7 +46,7 @@ function index()
{
$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
if(Yii::app()->request->getQuery('gid')!='')
{
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questiongroups/sa/view/surveyid/'.$aData['surveyid'].'/gid/'.sanitize_int(Yii::app()->request->getQuery('gid'));
Expand Down
10 changes: 5 additions & 5 deletions application/controllers/admin/questiongroups.php
View file
Expand Up @@ -106,7 +106,7 @@ function import()
$aData['sidemenu']['state'] = false;

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

$this->_renderWrappedTemplate('survey/QuestionGroups', 'import_view', $aData);
}
Expand Down Expand Up @@ -134,7 +134,7 @@ function importView($surveyid)


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

$this->_renderWrappedTemplate('survey/QuestionGroups', 'importGroup_view', $aData);
}
Expand Down Expand Up @@ -176,7 +176,7 @@ function add($surveyid)

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['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 @@ -310,7 +310,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['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['surveyIsActive'] = $surveyinfo['active']=='Y';
$aData['questiongroupbar']['buttons']['view'] = true;

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

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

///////////
// sidemenu
Expand Down
18 changes: 9 additions & 9 deletions application/controllers/admin/questions.php
View file
Expand Up @@ -113,7 +113,7 @@ public function view($surveyid, $gid, $qid)
$aData['sidemenu']['explorer']['qid'] = (isset($qid))?$qid:false;

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

// Last question visited : By user (only one by user)
$setting_entry = 'last_question_'.Yii::app()->user->getId();
Expand Down Expand Up @@ -156,7 +156,7 @@ public function importView($groupid = null, $surveyid)
$aData['surveyid'] = $surveyid;
$aData['groupid'] = $groupid;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";

$this->_renderWrappedTemplate('survey/Question', 'importQuestion_view', $aData);
}
Expand Down Expand Up @@ -251,7 +251,7 @@ public function import()
$aData['sidemenu']['state'] = false;
$aData['surveyid'] = $iSurveyID;
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";

$this->_renderWrappedTemplate('survey/Question', $aViewUrls, $aData);
}
Expand Down Expand Up @@ -402,7 +402,7 @@ public function editdefaultvalues($surveyid, $gid, $qid)


$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['questiongroupbar']['savebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid; // Close button

Expand Down Expand Up @@ -446,7 +446,7 @@ public function answeroptions($surveyid, $gid, $qid)
App()->getClientScript()->registerPackage('jquery-selectboxes');

$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$surveyid.")";
$aData['questiongroupbar']['savebutton']['form'] = true;
$aData['questiongroupbar']['saveandclosebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid; // Close button
Expand Down Expand Up @@ -664,7 +664,7 @@ public function subquestions($surveyid, $gid, $qid)
$aViewUrls = $this->_editsubquestion($surveyid, $gid, $qid);

$surveyinfo = Survey::model()->findByPk($surveyid)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$surveyid.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$surveyid.")";
$aData['questiongroupbar']['savebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['saveandclosebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid; // Close button
Expand Down Expand Up @@ -992,7 +992,7 @@ public function getSubquestionRow( $surveyid, $gid, $qid, $codes, $language, $fi
{
$view ='_answer_option';
$aData = array(
'assessmentvisible' => $assessmentvisible ? true : false,
'assessmentvisible' => $assessmentvisible == "false" ? false : true,
'assessment_value' => '',
'answer' => '',
'sortorder' => $newPosition,
Expand Down Expand Up @@ -1035,7 +1035,7 @@ public function newquestion($surveyid)
$surveyid = $iSurveyID = $aData['surveyid'] = sanitize_int($surveyid);
App()->getClientScript()->registerPackage('qTip2');
$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['surveybar']['importquestion'] = true;
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
$aData['surveybar']['saveandclosebutton']['form'] = 'frmeditgroup';
Expand Down Expand Up @@ -1173,7 +1173,7 @@ public function index($sa, $surveyid, $gid, $qid=null)
$aData['display']['menu_bars']['gid_action'] = 'addquestion';

$surveyinfo = Survey::model()->findByPk($iSurveyID)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyID.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyID.")";
$aData['questiongroupbar']['savebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['saveandclosebutton']['form'] = 'frmeditgroup';
$aData['questiongroupbar']['closebutton']['url'] = 'admin/questions/sa/view/surveyid/'.$surveyid.'/gid/'.$gid.'/qid/'.$qid; // Close button
Expand Down
8 changes: 4 additions & 4 deletions application/controllers/admin/quotas.php
View file
Expand Up @@ -103,7 +103,7 @@ function index($iSurveyId, $quickreport = false)

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

//$aData['surveybar']['active_survey_properties'] = 'quotas';
$aData['surveybar']['buttons']['view']= TRUE;
Expand Down Expand Up @@ -418,7 +418,7 @@ function editquota($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'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyId.")";

//$aData['surveybar']['active_survey_properties'] = 'quotas';
$aData['surveybar']['closebutton']['url'] = 'admin/quotas/sa/index/surveyid/'.$iSurveyId; // Close button
Expand Down Expand Up @@ -488,7 +488,7 @@ function new_answer($iSurveyId, $sSubAction = 'new_answer')

$aData['sidemenu']['state'] = false;
$surveyinfo = Survey::model()->findByPk($iSurveyId)->surveyinfo;
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']."(".gT("ID").":".$iSurveyId.")";
$aData['title_bar']['title'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyId.")";
$aData['surveybar']['closebutton']['url'] = 'admin/quotas/sa/index/surveyid/'.$iSurveyId; // Close button
$aData['surveybar']['closebutton']['forbidden'][] = 'new_answer';

Expand All @@ -507,7 +507,7 @@ function newquota($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'] = $surveyinfo['surveyls_title']." (".gT("ID").":".$iSurveyId.")";
$aData['surveybar']['savebutton']['form'] = 'frmeditgroup';
$aData['surveybar']['closebutton']['url'] = 'admin/quotas/sa/index/surveyid/'.$iSurveyId; // Close button

Expand Down
21 changes: 8 additions & 13 deletions application/controllers/admin/statistics.php
View file
Expand Up @@ -192,6 +192,7 @@ public function run($surveyid = 0, $subaction = null)

$grapherror = false;
$error = '';
$usegraph = (int)Yii::app()->request->getPost('usegraph',0);
if (!function_exists("gd_info")) {
$grapherror = true;
$error.='<br />'.gT('You do not have the GD Library installed. Showing charts requires the GD library to function properly.');
Expand All @@ -205,7 +206,7 @@ public function run($surveyid = 0, $subaction = null)

if ($grapherror)
{
unset($_POST['usegraph']);
$usegraph=0;
}


Expand Down Expand Up @@ -466,17 +467,14 @@ public function run($surveyid = 0, $subaction = null)

Yii::app()->loadHelper('admin/statistics');
$helper = new statistics_helper();
$showtextinline=isset($_POST['showtextinline']) ? 1 : 0;
$showtextinline = (int)Yii::app()->request->getPost('showtextinline',0);
$aData['showtextinline'] = $showtextinline;

$aData['usegraph'] = $usegraph;

//Show Summary results
if (isset($summary) && $summary)
{
$usegraph=isset($_POST['usegraph']) ? 1 : 0;
$aData['usegraph'] = $usegraph;
$outputType = $_POST['outputtype'];


$outputType = Yii::app()->request->getPost('outputtype','html');
switch($outputType){
case 'html':
$statisticsoutput .= $helper->generate_html_chartjs_statistics($surveyid,$summary,$summary,$usegraph,$outputType,'DD',$statlang);
Expand All @@ -494,10 +492,7 @@ public function run($surveyid = 0, $subaction = null)
}

} //end if -> show summary results

$usegraph=isset($_POST['usegraph']) ? 1 : 0;
$aData['usegraph'] = $usegraph;


$aData['sStatisticsLanguage']=$statlang;
$aData['output'] = $statisticsoutput;
$aData['summary'] = $summary;
Expand Down Expand Up @@ -787,7 +782,7 @@ public function simpleStatistics($surveyid)

Yii::app()->loadHelper('admin/statistics');
$helper = new statistics_helper();
$showtextinline=isset($_POST['showtextinline']) ? 1 : 0;
$showtextinline = (int)Yii::app()->request->getPost('showtextinline',0);
$aData['showtextinline'] = $showtextinline;

//Show Summary results
Expand Down

0 comments on commit 3981fea

Please sign in to comment.