Dev Removed obsolete {RELOADURL} placeholder

LimeSurvey · Dec 12, 2017 · a0df3e7 · a0df3e7
1 parent e9753b4
commit a0df3e7
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 14 deletions.
diff --git a/application/controllers/admin/limereplacementfields.php b/application/controllers/admin/limereplacementfields.php
@@ -216,7 +216,6 @@ private function _getReplacementFields($fieldtype, $surveyid)
 
             case 'email-admin_notification':
             case 'email-admin_detailed_notification':
-                $replFields['RELOADURL'] = gT("Reload URL");
                 $replFields['VIEWRESPONSEURL'] = gT("View response URL");
                 $replFields['EDITRESPONSEURL'] = gT("Edit response URL");
                 $replFields['STATISTICSURL'] = gT("Statistics URL");
@@ -235,7 +234,6 @@ private function _getReplacementFields($fieldtype, $surveyid)
                 return array($replFields, false);
 
             case 'email-admin-resp':
-                $replFields['RELOADURL'] = gT("Reload URL");
                 $replFields['VIEWRESPONSEURL'] = gT("View response URL");
                 $replFields['EDITRESPONSEURL'] = gT("Edit response URL");
                 $replFields['STATISTICSURL'] = gT("Statistics URL");

diff --git a/application/helpers/common_helper.php b/application/helpers/common_helper.php
@@ -919,7 +919,7 @@ function templateDefaultTexts($sLanguage, $mode = 'html', $sNewlines = 'text')
     App()->setLanguage($sLanguage);
     $aDefaultTexts = array(
     'admin_detailed_notification_subject'=>gT("Response submission for survey {SURVEYNAME} with results", $mode),
-    'admin_detailed_notification'=>gT("Hello,\n\nA new response was submitted for your survey '{SURVEYNAME}'.\n\nClick the following link to reload the survey:\n{RELOADURL}\n\nClick the following link to see the individual response:\n{VIEWRESPONSEURL}\n\nClick the following link to edit the individual response:\n{EDITRESPONSEURL}\n\nView statistics by clicking here:\n{STATISTICSURL}\n\n\nThe following answers were given by the participant:\n{ANSWERTABLE}", $mode),
+    'admin_detailed_notification'=>gT("Hello,\n\nA new response was submitted for your survey '{SURVEYNAME}'.\n\nClick the following link to see the individual response:\n{VIEWRESPONSEURL}\n\nClick the following link to edit the individual response:\n{EDITRESPONSEURL}\n\nView statistics by clicking here:\n{STATISTICSURL}\n\n\nThe following answers were given by the participant:\n{ANSWERTABLE}", $mode),
     'admin_detailed_notification_css'=>'<style type="text/css">
     .printouttable {
     margin:1em auto;
@@ -957,7 +957,7 @@ function templateDefaultTexts($sLanguage, $mode = 'html', $sNewlines = 'text')
     }
     </style>',
     'admin_notification_subject'=>gT("Response submission for survey {SURVEYNAME}", $mode),
-    'admin_notification'=>gT("Hello,\n\nA new response was submitted for your survey '{SURVEYNAME}'.\n\nClick the following link to reload the survey:\n{RELOADURL}\n\nClick the following link to see the individual response:\n{VIEWRESPONSEURL}\n\nClick the following link to edit the individual response:\n{EDITRESPONSEURL}\n\nView statistics by clicking here:\n{STATISTICSURL}", $mode),
+    'admin_notification'=>gT("Hello,\n\nA new response was submitted for your survey '{SURVEYNAME}'.\n\nClick the following link to see the individual response:\n{VIEWRESPONSEURL}\n\nClick the following link to edit the individual response:\n{EDITRESPONSEURL}\n\nView statistics by clicking here:\n{STATISTICSURL}", $mode),
     'confirmation_subject'=>gT("Confirmation of your participation in our survey"),
     'confirmation'=>gT("Dear {FIRSTNAME},\n\nthis email is to confirm that you have completed the survey titled {SURVEYNAME} and your response has been saved. Thank you for participating.\n\nIf you have any further questions about this email, please contact {ADMINNAME} on {ADMINEMAIL}.\n\nSincerely,\n\n{ADMINNAME}", $mode),
     'invitation_subject'=>gT("Invitation to participate in a survey", $mode),

diff --git a/application/helpers/frontend_helper.php b/application/helpers/frontend_helper.php
@@ -505,16 +505,6 @@ function sendSubmitNotifications($surveyid)
 
     $aReplacementVars = array();
 
-    // TODO: What is holdpass, and is it OK to skip these lines if it is set? Related to 'Resume later' functionality
-    if ($thissurvey['allowsave'] == "Y" && isset($_SESSION['survey_'.$surveyid]['scid']) && isset($_SESSION['survey_'.$surveyid]['holdpass'])) {
-        $aReplacementVars['RELOADURL'] = Yii::app()->getController()->createUrl("/survey/index/sid/{$surveyid}/loadall/reload/scid/".$_SESSION['survey_'.$surveyid]['scid']."/lang/".urlencode(App()->language), array('loadname'=>$_SESSION['survey_'.$surveyid]['holdname'], 'loadpass'=>$_SESSION['survey_'.$surveyid]['holdpass']));
-        if ($bIsHTML) {
-            $aReplacementVars['RELOADURL'] = "<a href='{$aReplacementVars['RELOADURL']}'>{$aReplacementVars['RELOADURL']}</a>";
-        }
-    } else {
-        $aReplacementVars['RELOADURL'] = '';
-    }
-
     if (!isset($_SESSION['survey_'.$surveyid]['srid'])) {
             $srid = null;
     } else {