feat(Webforms) permit user to define return URL protocol so we suppor…

…t https, by default we still use http to maintain backward compatibility
tsolucio · Mar 24, 2019 · 962db7d · 962db7d
1 parent 0a0520d
commit 962db7d
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/Smarty/templates/modules/Webforms/DetailView.tpl b/Smarty/templates/modules/Webforms/DetailView.tpl
@@ -138,7 +138,7 @@
 														{'LBL_RETURNURL'|@getTranslatedString:$MODULE}
 													</td>
 													<td class="dvtCellInfo" align="left" >
-														http://{$WEBFORMMODEL->getReturnUrl()}
+														{$WEBFORMMODEL->getReturnUrl()}
 													</td>
 												</tr>
 												<tr style="height:25px;">

diff --git a/Smarty/templates/modules/Webforms/EditView.tpl b/Smarty/templates/modules/Webforms/EditView.tpl
@@ -149,7 +149,7 @@
 														{'LBL_RETURNURL'|@getTranslatedString:$MODULE}
 													</td>
 													<td class="dvtCellInfo" align="left" >
-														http:// <input type="text" onblur="this.className='detailedViewTextBox';" onfocus="this.className='detailedViewTextBoxOn';" class="detailedViewTextBox" id="returnurl" name="returnurl" value="{$WEBFORM->getReturnUrl()}">
+														<input type="text" onblur="this.className='detailedViewTextBox';" onfocus="this.className='detailedViewTextBoxOn';" class="detailedViewTextBox" id="returnurl" name="returnurl" value="{$WEBFORM->getReturnUrl()}">
 													</td>
 												</tr>
 												{if $WEBFORM->hasId()}

diff --git a/modules/Webforms/capture.php b/modules/Webforms/capture.php
@@ -123,7 +123,11 @@ protected function sendResponse($url, $success = false, $failure = false) {
 				echo $response;
 			}
 		} else {
-			header(sprintf("Location: http://%s?%s=%s", $url, ($success? 'success' : 'error'), ($success? $success: $failure)));
+			if (strpos($url, '://')) {
+				header(sprintf('Location: %s?%s=%s', $url, ($success? 'success' : 'error'), ($success? $success: $failure)));
+			} else {
+				header(sprintf('Location: http://%s?%s=%s', $url, ($success? 'success' : 'error'), ($success? $success: $failure)));
+			}
 		}
 	}
 }