Merge branch 'master' of github.com:LimeSurvey/LimeSurvey

LimeSurvey · Oct 12, 2017 · 1d0e29a · 1d0e29a
2 parents a8a7c42 + 5605450
commit 1d0e29a
Show file tree

Hide file tree

Showing 19 changed files with 60 additions and 27 deletions.
diff --git a/application/config/config-defaults.php b/application/config/config-defaults.php
@@ -93,9 +93,6 @@
 
 $config['maxemails']          = 50;               // The maximum number of emails to send in one go (this is to prevent your mail server or script from timeouting when sending mass mail)
 
-// Enable or Disable LDAP feature
-$config['enableLdap'] = false;
-
 // Experimental parameters, only change if you know what you're doing
 //
 // filterout_incomplete_answers

diff --git a/application/config/version.php b/application/config/version.php
@@ -12,11 +12,11 @@
  *150413
  */
 
-$config['versionnumber'] = '2.72.0';
+$config['versionnumber'] = '2.72.1';
 $config['dbversionnumber'] = 263;
 $config['buildnumber'] = '';
 $config['updatable'] = true;
-$config['assetsversionnumber'] = '2721';
+$config['assetsversionnumber'] = '2722';
 return $config;
 
 ?>
diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
@@ -1962,7 +1962,7 @@ public function importldap($iSurveyId)
                                 if (isset($responseGroup[$j][$ldap_queries[$ldapq]['language']]))
                                     $mylanguage = ldap_readattr($responseGroup[$j][$ldap_queries[$ldapq]['language']]);
 
-                                // In case Ldap Server encoding isn't UTF-8, let's translate
+                                // In case LDAP Server encoding isn't UTF-8, let's translate
                                 // the strings to UTF-8
                                 if ($ldapencoding != '')
                                 {

diff --git a/application/core/plugins/AuthLDAP/AuthLDAP.php b/application/core/plugins/AuthLDAP/AuthLDAP.php
@@ -17,7 +17,7 @@ class AuthLDAP extends ls\pluginmanager\AuthPluginBase
     protected $settings = array(
         'server' => array(
             'type' => 'string',
-            'label' => 'Ldap server',
+            'label' => 'LDAP server',
             'help' => 'e.g. ldap://ldap.example.com or ldaps://ldap.example.com'
         ),
         'ldapport' => array(

diff --git a/...tensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php b/...tensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php
@@ -24,7 +24,7 @@
                 </td>
                 <?php if ($result['result']):?>
                     <td class="text-success">
-                        <?php echo 'Exported' ; ?>
+                        <?php eT('Exported'); ?>
                     </td>
                 <?php else: ?>
                     <td class="text-warning">

diff --git a/application/helpers/ldap_helper.php b/application/helpers/ldap_helper.php
@@ -109,7 +109,7 @@ function ldap_doTokenSearch($ds, $ldapq, &$ResArray, $surveyid) {
     $userattrs=array();
 
     // First let's lowercase the ldap query values
-    prepareLdapQuery($ldapq);
+    prepareLDAPQuery($ldapq);
 
     // Retrieve the ldap user attribute-list to read
     $userparams = array('firstname_attr','lastname_attr',
@@ -308,7 +308,7 @@ function ldap_doTokenSearch($ds, $ldapq, &$ResArray, $surveyid) {
     return $totalrescount;
 }
 
-function prepareLdapQuery($queryId)
+function prepareLDAPQuery($queryId)
 {
     $ldap_queries = Yii::app()->getConfig('ldap_queries');
     $QueryName=$ldap_queries[$queryId]['name'];

diff --git a/application/helpers/qanda_helper.php b/application/helpers/qanda_helper.php
@@ -2511,13 +2511,12 @@ function upload_$ia[1]() {
             $filecountvalue = $tempval;
         }
     }
-    $value = htmlspecialchars($_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]],ENT_QUOTES,'utf-8');
-    $fileuploadDatas = array(
+    $fileuploadData = array(
         'fileid' => $ia[1],
-        'value' => $value,
+        'value' => $_SESSION['survey_'.Yii::app()->getConfig('surveyID')][$ia[1]],
         'filecountvalue'=>$filecountvalue,
     );
-    $answer .= doRender('/survey/questions/file_upload/answer', $fileuploadDatas, true);
+    $answer .= doRender('/survey/questions/file_upload/answer', $fileuploadData, true);
 
     $answer .= '<script type="text/javascript">
     var surveyid = '.Yii::app()->getConfig('surveyID').';

diff --git a/application/models/Plugin.php b/application/models/Plugin.php
@@ -14,7 +14,11 @@
  */
 
 /**
- * This is the model class for table "{{plugins}}".
+ * Class Plugin
+ *
+ * @property integer $id primary key
+ * @property string $name
+ * @property integer $active
  */
 class Plugin extends CActiveRecord {
 
@@ -25,8 +29,26 @@ class Plugin extends CActiveRecord {
     public static function model($className = __CLASS__) {
         return parent::model($className);
     }
-
+
+    /**
+    * Returns the table's name
+    *
+    * @access public
+    * @return string
+    */
     public function tableName() {
         return '{{plugins}}';
     }
-}
+
+    /**
+    * Returns the validation rules for attributes.
+    * @return array[]
+    */
+    public function rules() {
+        return array(
+            array('name','length', 'max'=>255),
+            array('active','default', 0),
+            array('active','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
+        );
+    }
+}
diff --git a/application/models/PluginSetting.php b/application/models/PluginSetting.php
@@ -51,10 +51,9 @@ public function tableName() {
     public function rules() {
         return array(
             array('plugin_id','numerical', 'integerOnly'=>true), // 'allowEmpty'=>false ?
-            array('model','string', 'max'=>255,'allowEmpty'=>true),
+            array('model','length', 'max'=>255,'allowEmpty'=>true),
             array('model_id','numerical', 'integerOnly'=>true,'allowEmpty'=>true),
-            array('key','string', 'max'=>255),
-            array('value','string'),
+            array('key','length', 'max'=>255),
         );
     }
 }
diff --git a/application/views/admin/survey/subview/accordion/_notification_panel.php b/application/views/admin/survey/subview/accordion/_notification_panel.php
@@ -1,10 +1,10 @@
-participantsphp
+<?php
 /**
  * Notificatin panel
  */
 ?>
 <!-- Notification panel -->
-<div id='notification'  class="tab-pane fade in">
+<div  id='notification'  class="tab-pane fade in">
 
     <!-- email basic to -->
     <div class="form-group">

diff --git a/application/views/survey/questions/file_upload/answer.php b/application/views/survey/questions/file_upload/answer.php
@@ -20,8 +20,10 @@ class='btn btn-default upload'
         <span class='fa fa-upload'></span>&nbsp;<?php eT('Upload files'); ?>
     </a>
 </div>
-<input type='hidden' id='<?php echo $fileid;?>' name='<?php echo $fileid;?>' value='<?php echo $value;?>' />
-<input type='hidden' id='<?php echo $fileid;?>_filecount' name='<?php echo $fileid;?>_filecount' value="<?php echo $filecountvalue?>" />
+<?php 
+    echo CHtml::hiddenField($fileid, $value, array('name'=>$fileid));
+    echo CHtml::hiddenField($fileid.'_filecount', $filecountvalue, array('name'=>$fileid.'_filecount'));
+?>
 <div id='<?php echo $fileid;?>_uploadedfiles'>
 </div>
 <!-- end of answer -->
diff --git a/docs/release_notes.txt b/docs/release_notes.txt
@@ -35,7 +35,17 @@ Thank you to everyone who helped with this new release!
 CHANGE LOG
 ------------------------------------------------------
 
-Changes from 2.71.1 (build 170927) to 2.72.0 (build 170927) Oct 10, 2017
+Changes from 2.72.0 (build 171010) to 2.72.1 (build 171012) Oct 12, 2017
+-Fixed issue #12551: Untranslated string (Carsten Schmitz)
+-Fixed issue #12765: When saving survey settings an error is shown. (Carsten Schmitz)
+-Fixed issue: Unable to save plugin settings (Denis Chenu)
+#Updated translation: Catalan by qualitatuvic
+#Updated translation: French (France) by arnaud21
+#Updated translation: Hungarian by kkd
+#Updated translation: Indonesian by radhwaw
+#Updated translation: Norwegian (Bokmål) by pmonstad
+
+Changes from 2.71.1 (build 170927) to 2.72.0 (build 171010) Oct 10, 2017
 -New feature #12691: Allow initial superadmin to login via LDAP (Denis Chenu)
 -New feature #9235: Copy, export and import survey plugin settings (Denis Chenu)
 -New feature: Copy survey from remotecontroll (#688) (Stefan Verweij)

diff --git a/locale/_template/limesurvey.pot b/locale/_template/limesurvey.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: LimeSurvey language file\n"
 "Report-Msgid-Bugs-To: http://translate.limesurvey.org/\n"
-"POT-Creation-Date: 2017-10-10 11:15:33+00:00\n"
+"POT-Creation-Date: 2017-10-12 07:05:45+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -5981,6 +5981,10 @@ msgstr ""
 msgid "Expiry date/time:"
 msgstr ""
 
+#: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php:27
+msgid "Exported"
+msgstr ""
+
 #: application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_export_archive_results.php:42
 #: application/views/admin/token/massive_actions/_export_archive_results.php:42
 msgid "Download archive"

diff --git a/locale/ca/ca.mo b/locale/ca/ca.mo
diff --git a/locale/fr/fr.mo b/locale/fr/fr.mo
diff --git a/locale/hu/hu.mo b/locale/hu/hu.mo
diff --git a/locale/id/id.mo b/locale/id/id.mo
diff --git a/locale/nb/nb.mo b/locale/nb/nb.mo
diff --git a/scripts/modaldialog.js b/scripts/modaldialog.js
@@ -82,7 +82,7 @@ function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show
 
     if (jsonstring !== '')
     {
-        jsonobj = eval('(' + jsonstring + ')');
+        jsonobj = JSON.parse(jsonstring);
         display = '<table width="100%" class="question uploadedfiles"><thead><tr><td width="20%">&nbsp;</td>';
         if (show_title != 0)
             display += '<th>'+uploadLang.headTitle+'</th>';