fixed setup

mreishman · mreishman · commit d5b4324b92d0 · 2019-01-09T14:55:24.000-06:00
diff --git a/core/js/settingsAll.js b/core/js/settingsAll.js
@@ -1,5 +1,8 @@
-function saveAndVerifyMain(idForForm)
+var modiferUrl = "";
+
+function saveAndVerifyMain(idForForm, modifier = "")
 {
+	modiferUrl = modifier;
 	idForFormMain = idForForm;
 	idForm = "#"+idForForm;
 	displayLoadingPopup();
@@ -28,7 +31,7 @@ function timerVerifySave()
 	countForVerifySave++;
 	if(countForVerifySave < 20)
 	{
-		var urlForSend = "core/php/saveFunctions/saveCheck.php?format=json";
+		var urlForSend = modiferUrl+"core/php/saveFunctions/saveCheck.php?format=json";
 		$.ajax(
 		{
 			url: urlForSend,
diff --git a/setup/welcome.php b/setup/welcome.php
@@ -53,13 +53,13 @@ function clean_url($url) {
 	function defaultSettings()
 	{
 		//change setupProcess to finished
-		saveAndVerifyMain("defaultVarsForm");
+		saveAndVerifyMain("defaultVarsForm","../");
 	}
 
 	function customSettings()
 	{
 		//change setupProcess to page1
-		saveAndVerifyMain("defaultVarsForm");
+		saveAndVerifyMain("defaultVarsForm","../");
 	}
 </script>
 <script src="stepsJavascript.js"></script>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,8 @@`
`1`		`-function saveAndVerifyMain(idForForm)`
	`1`	`+var modiferUrl = "";`
	`2`	`+`
	`3`	`+function saveAndVerifyMain(idForForm, modifier = "")`
`2`	`4`	`{`
	`5`	`+ modiferUrl = modifier;`
`3`	`6`	`idForFormMain = idForForm;`
`4`	`7`	`idForm = "#"+idForForm;`
`5`	`8`	`displayLoadingPopup();`
`@@ -28,7 +31,7 @@ function timerVerifySave()`
`28`	`31`	`countForVerifySave++;`
`29`	`32`	`if(countForVerifySave < 20)`
`30`	`33`	`{`
`31`		`- var urlForSend = "core/php/saveFunctions/saveCheck.php?format=json";`
	`34`	`+ var urlForSend = modiferUrl+"core/php/saveFunctions/saveCheck.php?format=json";`
`32`	`35`	`$.ajax(`
`33`	`36`	`{`
`34`	`37`	`url: urlForSend,`
Original file line number	Diff line number	Diff line change
`@@ -53,13 +53,13 @@ function clean_url($url) {`
`53`	`53`	`function defaultSettings()`
`54`	`54`	`{`
`55`	`55`	`//change setupProcess to finished`
`56`		`- saveAndVerifyMain("defaultVarsForm");`
	`56`	`+ saveAndVerifyMain("defaultVarsForm","../");`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`function customSettings()`
`60`	`60`	`{`
`61`	`61`	`//change setupProcess to page1`
`62`		`- saveAndVerifyMain("defaultVarsForm");`
	`62`	`+ saveAndVerifyMain("defaultVarsForm","../");`
`63`	`63`	`}`
`64`	`64`	`</script>`
`65`	`65`	`<script src="stepsJavascript.js"></script>`