added verification check for consec success saves

Author: mreishman

core/conf/config.php

@@ -24,6 +24,7 @@
 	'blockGitCommitDiff'	=>	'false',
 	'blockGitCommitHistory'	=>	'false',
 	'blockGitShowCommitStuff'	=>	'false',
+	'successVerifyNum'			=> 3,
 	'defaultBranchList'	=> 'master',
 	'errorAndColorArray'	=> array(
 		'error'	=> array(

core/html/changelog.html

@@ -6,7 +6,10 @@
 				Features
 				<ul>
 					<li>
-					Added option for custom git url
+						Added option for custom git url
+					</li>
+					<li>
+						Buttons to move watchlist blocks up / down
 					</li>
 				</ul>
 			</li>
@@ -22,6 +25,9 @@
 					<li>
 						Fixed bug where adding a new server / removing a server would show dropdown inputs as text field inputs
 					</li>
+					<li>
+						Added consecutive save verify check on saves
+					</li>
 				</ul>
 			</li>
 		</ul>

core/js/settingsAll.js

@@ -1,4 +1,7 @@
 var modiferUrl = "";
+var countForVerifySave = 0;
+var countForVerifySaveSuccess = 0;
+var successVerifyNum = 3;
 
 function saveAndVerifyMain(idForForm, modifier = "")
 {
@@ -23,6 +26,7 @@ function saveAndVerifyMain(idForForm, modifier = "")
 function verifySaveTimer()
 {
 	countForVerifySave = 0;
+	countForVerifySaveSuccess = 0;
 	pollCheckForUpdate = setInterval(timerVerifySave,3000);
 }
 
@@ -42,28 +46,16 @@ function timerVerifySave()
 			{
 				if(data === true)
 				{
-					clearInterval(pollCheckForUpdate);
-					if(idForFormMain === "settingsMainWatch")
+					countForVerifySaveSuccess++;
+					if(countForVerifySaveSuccess >= successVerifyNum)
 					{
-						showPopupForCacheClear = false;
-						clearCache();
-					}
-					else
-					{
-						if(document.getElementsByName("pollType")[0])
-						{
-							if(document.getElementsByName("pollType")[0].value !== "2")
-							{
-								document.getElementById("menuBarLeftSettingsServerWatchList").style.display = "none";
-							}
-							else
-							{
-								document.getElementById("menuBarLeftSettingsServerWatchList").style.display = "block";
-							}
-						}
-						saveVerified();
+						verifySuccess();
 					}
 				}
+				else
+				{
+					countForVerifySaveSuccess = 0;
+				}
 			},
 		});
 	}
@@ -74,6 +66,31 @@ function timerVerifySave()
 	}
 }
 
+function verifySuccess()
+{
+	clearInterval(pollCheckForUpdate);
+	if(idForFormMain === "settingsMainWatch")
+	{
+		showPopupForCacheClear = false;
+		clearCache();
+	}
+	else
+	{
+		if(document.getElementsByName("pollType")[0])
+		{
+			if(document.getElementsByName("pollType")[0].value !== "2")
+			{
+				document.getElementById("menuBarLeftSettingsServerWatchList").style.display = "none";
+			}
+			else
+			{
+				document.getElementById("menuBarLeftSettingsServerWatchList").style.display = "block";
+			}
+		}
+		saveVerified();
+	}
+}
+
 function saveVerified()
 {
 	saveSuccess();

core/php/templateFiles/devBoxSettings.php

@@ -54,6 +54,16 @@
 						</li>
 					</ul>
 				</li>
+				<li>
+					Save Success Num:
+					<select name="successVerifyNum">
+  						<option <?php if($successVerifyNum == 1){echo "selected";} ?> value="1">1</option>
+  						<option <?php if($successVerifyNum == 2){echo "selected";} ?> value="2">2</option>
+  						<option <?php if($successVerifyNum == 3){echo "selected";} ?> value="3">3</option>
+  						<option <?php if($successVerifyNum == 4){echo "selected";} ?> value="4">4</option>
+  						<option <?php if($successVerifyNum == 5){echo "selected";} ?> value="5">5</option>
+					</select>
+				</li>
 			</ul>
 		</div>
 	</div>

settings-watchList.php

@@ -112,6 +112,7 @@ function saveWatchList(post)
 <?php
 	echo "var currentVersion = '".$configStatic['version']."';";
 ?>
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
 </script>
 <script src="core/js/allPages.js?v=<?php echo $configStatic['version']; ?>"></script>
 <script src="core/js/cacheClear.js?v=<?php echo $configStatic['version']; ?>"></script>

settings-watchListServer.php

@@ -112,6 +112,7 @@ function saveWatchList(post)
 <?php
 	echo "var currentVersion = '".$configStatic['version']."';";
 ?>
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
 	</script>
 	<script src="core/js/allPages.js?v=<?php echo $configStatic['version']; ?>"></script>
 	<script src="core/js/settingsAll.js?v=<?php echo $configStatic['version']; ?>"></script>

settings.php

@@ -72,6 +72,7 @@
 	var counfOfFiltersForbranchName = <?php echo $counfOfFiltersForbranchName; ?>;
 	var counfOfFiltersForAuthorName = <?php echo $counfOfFiltersForAuthorName; ?>;
 	var counfOfFiltersForComitteeName = <?php echo $counfOfFiltersForComitteeName; ?>;
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
 
 	function calcuateWidth()
 	{

setup/step1.php

@@ -14,7 +14,7 @@ function clean_url($url) {
 }
 
 
-require_once($baseUrl.'conf/config.php'); 
+require_once($baseUrl.'conf/config.php');
 require_once('setupProcessFile.php');
 
 if($setupProcess != "step1")
@@ -49,7 +49,7 @@ function clean_url($url) {
 	</style>
 </head>
 <body>
-<?php readfile('../core/html/popup.html') ?>	
+<?php readfile('../core/html/popup.html') ?>
 <div class="firstBoxDev" style="width: 90%; margin: auto; margin-right: auto; margin-left: auto; display: block; height: auto; margin-top: 15px;" >
 	<div class="devBoxTitle">
 		<h1>Step 1 of <?php echo $counterSteps; ?></h1>
@@ -98,6 +98,7 @@ function clean_url($url) {
 </body>
 <form id="defaultVarsForm" action="../core/php/saveFunctions/settingsSaveMain.php" method="post"></form>
 <script type="text/javascript">
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
 
 	function updateStatusCustom()
 	{

setup/step2.php

@@ -72,6 +72,8 @@ function clean_url($url) {
 </body>
 <form id="defaultVarsForm" action="../core/php/saveFunctions/settingsSaveMain.php" method="post"></form>
 <script type="text/javascript">
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
+
 	function defaultSettings()
 	{
 		//change setupProcess to finished

setup/step3.php

@@ -72,6 +72,8 @@ function clean_url($url) {
 </body>
 <form id="defaultVarsForm" action="../core/php/saveFunctions/settingsSaveMain.php" method="post"></form>
 <script type="text/javascript">
+	var successVerifyNum = <?php echo $successVerifyNum; ?>;
+
 	function defaultSettings()
 	{
 		//change setupProcess to finished