diff --git a/application/config/version.php b/application/config/version.php
index c54ec138be9..607c28c7839 100644
--- a/application/config/version.php
+++ b/application/config/version.php
@@ -12,9 +12,9 @@
*/
-$config['versionnumber'] = '3.15.2';
+$config['versionnumber'] = '3.15.4';
$config['dbversionnumber'] = 355;
$config['buildnumber'] = '';
$config['updatable'] = true;
-$config['assetsversionnumber'] = '30065';
+$config['assetsversionnumber'] = '30067';
return $config;
diff --git a/application/controllers/admin/export.php b/application/controllers/admin/export.php
index 52617e28ef1..559618c0073 100644
--- a/application/controllers/admin/export.php
+++ b/application/controllers/admin/export.php
@@ -642,7 +642,7 @@ public function vvexport()
if (count($fielddata) < 1) {
$firstline .= $field;
} else {
- $firstline .= preg_replace('/\s+/', ' ', strip_tags($fielddata['question']));
+ $firstline .= preg_replace('/\s+/', ' ', flattenText($fielddata['question'],false,true,'UTF-8',true));
}
$firstline .= $s;
if ($vvVersion == 2) {
diff --git a/application/controllers/admin/surveyadmin.php b/application/controllers/admin/surveyadmin.php
index 6505a879a04..4073bd5362d 100644
--- a/application/controllers/admin/surveyadmin.php
+++ b/application/controllers/admin/surveyadmin.php
@@ -2275,4 +2275,89 @@ public function applythemeoptions($iSurveyID = 0)
}
$this->getController()->redirect(array('admin/survey/sa/view/surveyid/'.$iSurveyID));
}
+
+ /**
+ * Upload an image in directory
+ * @return json
+ */
+ public function uploadimagefile()
+ {
+ $iSurveyID = Yii::app()->request->getPost('surveyid');
+ $success = false;
+ $debug = [];
+ if(!Permission::model()->hasSurveyPermission($iSurveyID, 'surveycontent', 'update')) {
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => gT("You don't have suffisient right to upload image in this survey"), 'debug' => $debug]),
+ false,
+ false
+ );
+ }
+ $debug[] = $_FILES;
+ if(empty($_FILES)) {
+ $uploadresult = gT("No file was uploaded.");
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => $uploadresult, 'debug' => $debug]),
+ false,
+ false
+ );
+ }
+ if ($_FILES['file']['error'] == 1 || $_FILES['file']['error'] == 2) {
+ $uploadresult = sprintf(gT("Sorry, this file is too large. Only files up to %01.2f MB are allowed."), getMaximumFileUploadSize() / 1024 / 1024);
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => $uploadresult, 'debug' => $debug]),
+ false,
+ false
+ );
+ }
+ $checkImage = LSYii_ImageValidator::validateImage($_FILES["file"]["tmp_name"]);
+ if ($checkImage['check'] === false) {
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => $checkImage['uploadresult'], 'debug' => $checkImage['debug']]),
+ false,
+ false
+ );
+ }
+ $surveyDir = Yii::app()->getConfig('uploaddir')."/surveys/".$iSurveyID;
+ if (!is_dir($surveyDir)) {
+ @mkdir($surveyDir);
+ }
+ if (!is_dir($surveyDir."/images")) {
+ @mkdir($surveyDir."/images");
+ }
+ $destdir = $surveyDir."/images/";
+ if (!is_writeable($destdir)) {
+ $uploadresult = sprintf(gT("Incorrect permissions in your %s folder."), $destdir);
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => $uploadresult, 'debug' => $debug]),
+ false,
+ false
+ );
+ }
+
+ $filename = sanitize_filename($_FILES['file']['name'], false, false, false); // Don't force lowercase or alphanumeric
+ $fullfilepath = $destdir.$filename;
+ $debug[] = $destdir;
+ $debug[] = $filename;
+ $debug[] = $fullfilepath;
+ if (!@move_uploaded_file($_FILES['file']['tmp_name'], $fullfilepath)) {
+ $uploadresult = gT("An error occurred uploading your file. This may be caused by incorrect permissions for the application /tmp folder.");
+ } else {
+ $uploadresult = sprintf(gT("File %s uploaded"), $filename);
+ $success = true;
+ };
+ return Yii::app()->getController()->renderPartial(
+ '/admin/super/_renderJson',
+ array('data' => ['success' => $success, 'message' => $uploadresult, 'debug' => $debug]),
+ false,
+ false
+ );
+
+
+
+ }
}
diff --git a/application/controllers/admin/themeoptions.php b/application/controllers/admin/themeoptions.php
index 50e5d88663f..e383e0c2154 100644
--- a/application/controllers/admin/themeoptions.php
+++ b/application/controllers/admin/themeoptions.php
@@ -112,7 +112,6 @@ public function updatesurvey($sid)
$this->getController()->redirect(Yii::app()->getController()->createUrl("/admin/themeoptions/sa/updatesurvey", ['surveyid'=>$sid, 'sid'=>$sid]));
}
}
-
$this->_updateCommon($model, $sid);
} else {
Yii::app()->setFlashMessage(gT("We are sorry but you don't have permissions to do this."), 'error');
@@ -343,8 +342,9 @@ private function _updateCommon(TemplateConfiguration $model, $sid = null)
Yii::app()->clientScript->registerPackage('bootstrap-switch', LSYii_ClientScript::POS_BEGIN);
$aData = array(
- 'model'=>$model,
- 'templateOptionPage' => $templateOptionPage
+ 'model' => $model,
+ 'templateOptionPage' => $templateOptionPage,
+ 'sid' => $sid
);
if ($sid !== null) {
diff --git a/application/controllers/admin/themes.php b/application/controllers/admin/themes.php
index c2900d46f27..15a6b0443aa 100755
--- a/application/controllers/admin/themes.php
+++ b/application/controllers/admin/themes.php
@@ -172,14 +172,17 @@ public function tmp($id)
*/
public function upload()
{
+ $action = returnGlobal('action');
+ if ($action == 'templateuploadimagefile' && Yii::app()->request->getPost('surveyid') ) {
+ Yii::app()->getController()->forward("/admin/survey/sa/uploadimagefile/");
+ Yii::app()->end();
+ }
if (Permission::model()->hasGlobalPermission('templates', 'import')) {
Yii::app()->loadHelper('admin/template');
$lid = returnGlobal('lid');
- $action = returnGlobal('action');
$uploadresult = "";
$success = false;
$debug = [];
-
if ($action == 'templateuploadimagefile') {
// $iTemplateConfigurationId = Yii::app()->request->getPost('templateconfig');
// $oTemplateConfiguration = TemplateConfiguration::getInstanceFromConfigurationId($iTemplateConfigurationId);
diff --git a/application/core/plugins/GroupSpecificActivation b/application/core/plugins/GroupSpecificActivation
new file mode 160000
index 00000000000..0dd28d3d48e
--- /dev/null
+++ b/application/core/plugins/GroupSpecificActivation
@@ -0,0 +1 @@
+Subproject commit 0dd28d3d48ed23b8ecf73c50e20f0319ff5256a2
diff --git a/application/helpers/admin/import_helper.php b/application/helpers/admin/import_helper.php
index c881da9ab39..a7eb9790e38 100644
--- a/application/helpers/admin/import_helper.php
+++ b/application/helpers/admin/import_helper.php
@@ -2024,11 +2024,11 @@ function CSVImportResponses($sFullFilePath, $iSurveyId, $aOptions = array())
}
//Check if datestamp is set => throws no default error on importing
- if(!isset($oSurvey->datestamp)){
+ if($oSurvey->hasAttribute('datestamp') && !isset($oSurvey->datestamp)){
$oSurvey->datestamp = '1980-01-01 00:00:01';
}
//Check if startdate is set => throws no default error on importing
- if(!isset($oSurvey->startdate)){
+ if($oSurvey->hasAttribute('startdate') && !isset($oSurvey->startdate)){
$oSurvey->startdate = '1980-01-01 00:00:01';
}
diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
index 33c0ef50b91..98726f0ca9b 100644
--- a/application/helpers/common_helper.php
+++ b/application/helpers/common_helper.php
@@ -331,16 +331,27 @@ function convertGETtoPOST($url)
$query = array_shift($stack);
$aqueryitems = explode('&', $query);
$postArray = [];
-
+ $getArray = [];
foreach ($aqueryitems as $queryitem) {
$stack = explode('=', $queryitem);
$paramname = array_shift($stack);
$value = array_shift($stack);
- $postArray[$paramname] = $value;
+ if(in_array($paramname,array(Yii::app()->getComponent('urlManager')->routeVar))) {
+ $getArray[$paramname] = $value;
+ } else {
+ $postArray[$paramname] = $value;
+ }
+ }
+ if(!empty($getArray)) {
+ $calledscript = $calledscript."?".implode('&', array_map(
+ function ($v, $k) {
+ return $k.'='.$v;
+ },
+ $getArray,
+ array_keys($getArray)
+ ));
}
-
$callscript = "window.LS.sendPost(\"".$calledscript."\",\"\",".json_encode($postArray).");";
-
return $callscript;
}
@@ -5085,4 +5096,4 @@ function safecount($element)
return count($element);
}
return 0;
-}
\ No newline at end of file
+}
diff --git a/application/helpers/update/updatedb_helper.php b/application/helpers/update/updatedb_helper.php
index b6e224e8a5e..21ed585f306 100644
--- a/application/helpers/update/updatedb_helper.php
+++ b/application/helpers/update/updatedb_helper.php
@@ -2289,7 +2289,7 @@ function db_upgrade_all($iOldDBVersion, $bSilent = false)
$oDB->createCommand()->delete('{{surveymenu}}', 'name=:name', [':name' => $aSurveymenu['name']]);
$oDB->createCommand()->delete('{{surveymenu}}', 'id=:id', [':id' => $aSurveymenu['id']]);
$oDB->createCommand()->insert('{{surveymenu}}', $aSurveymenu);
- $aIdMap[$aSurveymenu['name']] = $oDB->getCommandBuilder()->getLastInsertID('{{surveymenu}}');
+ $aIdMap[$aSurveymenu['name']] = $aSurveymenu['id'];
}
$aDefaultSurveyMenuEntries = LsDefaultDataSets::getSurveyMenuEntryData();
diff --git a/application/libraries/MersenneTwister.php b/application/libraries/MersenneTwister.php
index 6889311ec8d..63ac7db939c 100644
--- a/application/libraries/MersenneTwister.php
+++ b/application/libraries/MersenneTwister.php
@@ -15,6 +15,12 @@ function setSeed($surveyid)
if (isset($_SESSION['survey_'.$surveyid]['srid'])) {
$oResponse = \Response::model($surveyid)->findByPk($_SESSION['survey_'.$surveyid]['srid']);
$seed = $oResponse->seed;
+ /* fix empty seed, this allow broken seed (not number) */
+ if(empty($seed)) {
+ $seed = mt_rand();
+ $oResponse->seed = $seed;
+ $oResponse->save();
+ }
} else {
$seed = mt_rand();
diff --git a/application/models/Permission.php b/application/models/Permission.php
index 8bcf8ab8447..0e23f3eff3a 100644
--- a/application/models/Permission.php
+++ b/application/models/Permission.php
@@ -744,7 +744,7 @@ protected function getOwnerId($iEntityID, $sEntityName)
}
public static function getPermissionList(){
- $aPermissions = self::getSurveyBasePermissions();
+ $aPermissions = array_merge(self::getSurveyBasePermissions(),self::getGlobalBasePermissions());
return array_map(function($aPermission){
return $aPermission['title'];
}, $aPermissions);
diff --git a/application/models/Survey.php b/application/models/Survey.php
index 8d16920cbab..ceb71a30ee5 100755
--- a/application/models/Survey.php
+++ b/application/models/Survey.php
@@ -799,10 +799,17 @@ private function _createSurveymenuArray($oSurveyMenuObjects, $collapsed=false)
}
//Skip menu if no permission
- if ((!empty($aEntry['permission']) && !empty($aEntry['permission_grade'])
- && !Permission::model()->hasSurveyPermission($this->sid, $aEntry['permission'], $aEntry['permission_grade']))
- ) {
- continue;
+ if (!empty($aEntry['permission']) && !empty($aEntry['permission_grade'])){
+ $inArray = array_search($aEntry['permission'],array_keys(Permission::getGlobalBasePermissions()));
+ if($inArray) {
+ $hasPermission = Permission::model()->hasGlobalPermission($aEntry['permission'], $aEntry['permission_grade']);
+ } else {
+ $hasPermission = Permission::model()->hasSurveyPermission($this->sid, $aEntry['permission'], $aEntry['permission_grade']);
+ }
+
+ if(!$hasPermission) {
+ continue;
+ }
}
// Check if a specific user owns this menu.
diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
index 912248a22bd..2abafa7b450 100755
--- a/application/models/TemplateConfiguration.php
+++ b/application/models/TemplateConfiguration.php
@@ -785,20 +785,24 @@ private function _getRelativePath($from, $to) {
return str_repeat('..'.DIRECTORY_SEPARATOR, count($dir)) . implode(DIRECTORY_SEPARATOR, $file);
}
- private function _filterImages($file)
+ /**
+ * Return image information
+ * @param string $file with Path
+ * @return array|null
+ */
+ private function _getImageInfo($file)
{
- $imagePath = (file_exists($this->filesPath.$file['name']))
- ? $this->filesPath.$file['name']
- : $this->generalFilesPath.$file['name'] ;
-
- $filePath = $this->_getRelativePath(Yii::app()->getConfig('rootdir'), $imagePath);
-
- $previewFilePath = App()->getAssetManager()->publish($imagePath);
-
- $checkImage = LSYii_ImageValidator::validateImage($imagePath);
- if (!$checkImage['check'] === false) {
- return ['preview' => $previewFilePath, 'filepath' => $filePath, 'filepathOptions' => $filePath ,'filename'=>$file['name']];
+ if(!file_exists($file)) {
+ return;
+ }
+ // Currently it's private and only used one time, before put this function in twig : must validate directory is inside rootdir
+ $checkImage = LSYii_ImageValidator::validateImage($file);
+ if (!$checkImage['check']) {
+ return;
}
+ $filePath = $this->_getRelativePath(Yii::app()->getConfig('rootdir'), $file);
+ $previewFilePath = App()->getAssetManager()->publish($file);
+ return ['preview' => $previewFilePath, 'filepath' => $filePath, 'filepathOptions' => $filePath ,'filename'=>basename($file)];
}
protected function getOptionPageAttributes()
@@ -807,13 +811,21 @@ protected function getOptionPageAttributes()
$fileList = array_merge(Template::getOtherFiles($this->filesPath), Template::getOtherFiles($this->generalFilesPath));
$aData['maxFileSize'] = getMaximumFileUploadSize();
$aData['imageFileList'] = [];
- foreach ($fileList as $file) {
- $isImage = $this->_filterImages($file);
-
- if ($isImage) {
- $aData['imageFileList'][] = $isImage;
- }
- };
+ $categoryList = []; // Array with optgroup label and path
+ $categoryList[] = ['group' => gT("Global"),'path' => $this->generalFilesPath];
+ $categoryList[] = ['group' => gT("Theme"),'path' => $this->filesPath];
+ if($this->sid) {
+ $categoryList[] = ['group' => gT("Survey"),'path' => Yii::app()->getConfig('uploaddir').'/surveys/'.$this->sid.'/images/'];
+ }
+ foreach($categoryList as $category) {
+ $fileList = Template::getOtherFiles($category['path']);
+ foreach ($fileList as $file) {
+ $imageInfo = $this->_getImageInfo($category['path'].$file['name']);
+ if ($imageInfo) {
+ $aData['imageFileList'][] = array_merge($category,$imageInfo);
+ }
+ };
+ }
return $aData;
}
diff --git a/application/views/admin/token/managetokenattributes.php b/application/views/admin/token/managetokenattributes.php
index c2d6928fdd6..c62f6448376 100644
--- a/application/views/admin/token/managetokenattributes.php
+++ b/application/views/admin/token/managetokenattributes.php
@@ -149,7 +149,7 @@
- gT('(None)','unescaped'), 'class'=>'form-control')); ?>
+ gT('(None)','unescaped'), 'class'=>'form-control')); ?>
diff --git a/assets/packages/adminbasics/build/adminbasics.debug.js b/assets/packages/adminbasics/build/adminbasics.debug.js
index 134d172d1b9..0cbb22d3a9d 100644
--- a/assets/packages/adminbasics/build/adminbasics.debug.js
+++ b/assets/packages/adminbasics/build/adminbasics.debug.js
@@ -9723,7 +9723,7 @@ module.exports=Math.scale||function scale(x,inLow,inHigh,outLow,outHigh){if(argu
* Also bootstrapping methods and window bound methods are set here
*/var globalWindowMethods={renderBootstrapSwitch:function renderBootstrapSwitch(){try{if(!$('[data-is-bootstrap-switch]').parent().hasClass('bootstrap-switch-container')){$('[data-is-bootstrap-switch]').bootstrapSwitch({onInit:function onInit(){return __WEBPACK_IMPORTED_MODULE_0__components_lslog__["a"/* default */].log("BootstrapSwitch Initialized");}});}}catch(e){__WEBPACK_IMPORTED_MODULE_0__components_lslog__["a"/* default */].error(e);}},unrenderBootstrapSwitch:function unrenderBootstrapSwitch(){try{$('[data-is-bootstrap-switch]').bootstrapSwitch('destroy');}catch(e){__WEBPACK_IMPORTED_MODULE_0__components_lslog__["a"/* default */].error(e);}},validatefilename:function validatefilename(form,strmessage){if(form.the_file.value==""){$('#pleaseselectfile-popup').modal();form.the_file.focus();return false;}return true;},doToolTip:function doToolTip(){try{$(".btntooltip").tooltip("destroy");}catch(e){}try{$('[data-tooltip="true"]').tooltip("destroy");}catch(e){}try{$('[data-tooltip="true"]').tooltip("destroy");}catch(e){}$(".btntooltip").tooltip();$('[data-tooltip="true"]').tooltip();$('[data-toggle="tooltip"]').tooltip();},// finds any duplicate array elements using the fewest possible comparison
arrHasDupes:function arrHasDupes(arrayToCheck){return _.uniq(arrayToCheck).length!==arrayToCheck.length;},arrHasDupesWhich:function arrHasDupesWhich(arrayToCheck){return _.difference(_.uniq(arrayToCheck),arrayToCheck).length>0;},getkey:function getkey(e){return window.event?window.event.keyCode:e?e.which:null;},goodchars:function goodchars(e,goods){var key=getkey(e);if(key==null)return true;// get character
-var keychar=String.fromCharCode(key).toLowerCase();goods=goods.toLowerCase();return goods.indexOf(keychar)!=-1||key==null||key==0||key==8||key==9||key==27;},tableCellAdapters:function tableCellAdapters(){$('table.activecell').on("click",['tbody td input:checkbox','tbody td input:radio','tbody td label','tbody th input:checkbox','tbody th input:radio','tbody th label'].join(', '),function(e){e.stopPropagation();});$('table.activecell').on("click",'tbody td, tbody th',function(){if($(this).find("input:radio,input:checkbox").length==1){$(this).find("input:radio").click();$(this).find("input:radio").triggerHandler("click");$(this).find("input:checkbox").click();$(this).find("input:checkbox").triggerHandler("click");}});},sendPost:function sendPost(url,content,contentObject){contentObject=contentObject||{};var $form=$("