Merge branch 'master' into develop

LimeSurvey · Apr 7, 2020 · e2bdc27 · e2bdc27
2 parents 6c8f924 + 572dd7d
commit e2bdc27
Show file tree

Hide file tree

Showing 25 changed files with 3,107 additions and 3,068 deletions.
diff --git a/application/config/version.php b/application/config/version.php
@@ -11,10 +11,10 @@
  * See COPYRIGHT.php for copyright notices and details.
  */
 
-$config['versionnumber'] = '4.1.14';
+$config['versionnumber'] = '4.1.16';
 $config['dbversionnumber'] = 425;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
 $config['templateapiversion']  = 3;
-$config['assetsversionnumber'] = '30129';
+$config['assetsversionnumber'] = '30132';
 return $config;
diff --git a/application/controllers/OptinController.php b/application/controllers/OptinController.php
@@ -61,14 +61,14 @@ function actiontokens($surveyid, $token, $langcode = '')
             $oToken = Token::model($iSurveyID)->findByAttributes(array('token' => $sToken));
 
             if (!isset($oToken)) {
-                $sMessage = gT('You are not a participant in this survey.');
+                $sMessage = gT('You are not a participant of this survey.');
             } else {
                 if ($oToken->emailstatus == 'OptOut') {
                     $oToken->emailstatus = 'OK';
                     $oToken->save();
                     $sMessage = gT('You have been successfully added back to this survey.');
                 } elseif ($oToken->emailstatus == 'OK') {
-                    $sMessage = gT('You are already a part of this survey.');
+                    $sMessage = gT('You are already a participant of this survey.');
                 } else {
                     $sMessage = gT('You have been already removed from this survey.');
                 }

diff --git a/application/controllers/UserManagementController.php b/application/controllers/UserManagementController.php
@@ -851,7 +851,7 @@ public function actionBatchAddGroup()
                     $aResults[$sItem]['result'] = $oUserGroup->addUser($sItem);
                 } else {
                     $aResults[$sItem]['result'] = false;
-                    $aResults[$sItem]['error'] = gT('User is already a part of the group');
+                    $aResults[$sItem]['error'] = gT('User is already a member of the group.');
                 }
             }
         } else {

diff --git a/application/controllers/admin/PermissiontemplatesController.php b/application/controllers/admin/PermissiontemplatesController.php
@@ -83,6 +83,10 @@ public function applyedit()
         $aPermissiontemplate = Yii::app()->request->getPost('Permissiontemplates');
         $model = $this->loadModel($aPermissiontemplate['ptid']);
 
+        // XSS filter
+        $aPermissiontemplate['name'] = CHtml::encode($aPermissiontemplate['name']);
+        $aPermissiontemplate['description'] = CHtml::encode($aPermissiontemplate['description']);
+
         $newAttributes = array_merge($model->attributes, $aPermissiontemplate);
         $model->attributes = $newAttributes;