Fixed issue #13714: Token email does not fill in adminemail and admin…

…name
LimeSurvey · Jun 11, 2018 · dbcc03b · dbcc03b
1 parent 2d0ed95
commit dbcc03b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/application/views/admin/token/invite.php b/application/views/admin/token/invite.php
@@ -102,8 +102,10 @@
                         <?php
                         $c = true;
                         foreach ($oSurvey->allLanguages as $language) {
-                                $fieldsarray["{ADMINNAME}"] = $oSurvey->admin;
-                                $fieldsarray["{ADMINEMAIL}"] = $oSurvey->adminemail;
+                                $admin_name = (empty($oSurvey->admin))?(Yii::app()->getConfig("siteadminname")):($oSurvey->admin);
+                                $admin_email  = (empty($oSurvey->adminemail))?(Yii::app()->getConfig("siteadminemail")):($oSurvey->adminemail);
+                                $fieldsarray["{ADMINNAME}"] = $admin_name;
+                                $fieldsarray["{ADMINEMAIL}"] = $admin_email;
                                 $fieldsarray["{SURVEYNAME}"] = $oSurvey->languagesettings[$language]->surveyls_title;
                                 $fieldsarray["{SURVEYDESCRIPTION}"] = $oSurvey->languagesettings[$language]->surveyls_description;
                                 $fieldsarray["{EXPIRY}"] = $oSurvey->expires;
@@ -119,7 +121,7 @@
                                 <div class='form-group'>
                                     <label class='control-label ' for='from_<?php echo $language; ?>'><?php eT("From:"); ?></label>
                                     <div class=''>
-                                        <?php echo CHtml::textField("from_{$language}",$oSurvey->admin." <".$oSurvey->adminemail.">",array('class' => 'form-control')); ?>
+                                        <?php echo CHtml::textField("from_{$language}",$admin_name." <".$admin_email.">",array('class' => 'form-control')); ?>
                                     </div>
                                 </div>