Touch-ups

README

@@ -5,8 +5,8 @@ Based on Linux Scanner Server 1.2 Beta
 
 Released under the GPL 2.0
 
-Last Update: 06/27/2013 (Month/Day/Year)
-For Version: 1.3-5
+Last Update: 06/29/2013 (Month/Day/Year)
+For Version: 1.3-6
 
 Change Log:
 	https://github.com/GM-Script-Writer-62850/PHP-Scanner-Server/wiki/Change-Log
@@ -128,9 +128,9 @@ Supported Browsers:
 		http://www.apple.com/safari/download/
 	Opera (NOT Opera Mini)
 		http://www.opera.com/browser/
-	IE 10+
+	IE 9+
 		http://windows.microsoft.com/en-us/internet-explorer/ie-10-worldwide-languages
-	IE 6-9 with google chrome frame installed
+	IE 6-8 with google chrome frame installed
 		http://code.google.com/chrome/chromeframe/ (EOL: January 2014)
 
 Enabling Auto-Deletion of old scans:

inc/edit.php

@@ -132,15 +132,15 @@
 	<div class="control"><input onkeypress="return validateKey(this,event,ias);" type="text" name="loc_x2" value="0" size="3"/> pixle(s)</div>
 <div class="label">Y<sub>2</sub> (Bottom): </div>
 	<div class="control"><input onkeypress="return validateKey(this,event,ias);" type="text" name="loc_y2" value="0" size="3"/> pixle(s)</div>
-<div align="center"><input type="button" value="Update" onclick="setRegion(ias);"/><input type="button" onclick="clearRegion(ias,true)" value="Clear"/></div>
+<div align="center"><input type="button" value="Update" onclick="setRegion(ias);"/> <input type="button" onclick="clearRegion(ias,true)" value="Clear"/></div>
 </p>
 </div>
 
 <div class="side_box">
 <h2>
 Save Image
 </h2>
-<p align="center"><input type="submit" value="Save Changes" name="action"><input type="reset" value="Reset Options" onclick="clearRegion(ias,false)"/></p>
+<p align="center"><input type="submit" value="Save Changes" name="action"/> <input type="reset" value="Reset Options" onclick="clearRegion(ias,false)"/></p>
 </div>
 </form>
 <?php echo $FILETYPE=='txt'?'<script type="text/javascript">document.scanning.action.disabled=true;</script>':''; ?>

inc/main.js

@@ -276,9 +276,8 @@ function parseJSON(jsonTXT){
 	try{
 		if(typeof(JSON)=='object')
 			return JSON.parse(jsonTXT);
-		else{
+		else
 			return eval('('+jsonTXT+')');
-		}
 	}
 	catch(e){
 		printMsg('Invald Javascript Object Notation:','<textarea onclick="this.select()" style="width:100%;height:80px;">'+encodeHTML(jsonTXT)+'</textarea><br/>If you are reading this please report it as a bug. Please copy/paste the above, something as simple as a line break can cause errors here. If want to read this I suggest pasting it onto <a target="_blank" href="http://jsonlint.com/">jsonlint.com</a>.','center',0);

inc/scan.php

@@ -260,22 +260,22 @@
 	<div class="control"><input onkeypress="return validateKey(this,event,ias);" type="text" name="loc_x2" value="0" size="3"/> pixle(s)</div>
 <div class="label">Y<sub>2</sub> (Bottom): </div>
 	<div class="control"><input onkeypress="return validateKey(this,event,ias);" type="text" name="loc_y2" value="0" size="3"/> pixle(s)</div>
-<div align="center"><input type="button" value="Update" onclick="setRegion(ias);"/><input type="button" onclick="clearRegion(ias,true)" value="Clear"/></div>
+<div align="center"><input type="button" value="Update" onclick="setRegion(ias);"/> <input type="button" onclick="clearRegion(ias,true)" value="Clear"/></div>
 </p>
 </div>
 
 <div class="side_box">
 <h2>
 Scan Image
 </h2>
-<p align="center"><input type="submit" value="Scan Image" name="action"><input name="reset" type="reset" value="Reset Options" onclick="clearRegion(ias,false);setTimeout(scanReset,1);"/></p>
+<p align="center"><input type="submit" value="Scan Image" name="action"> <input name="reset" type="reset" value="Reset Options" onclick="clearRegion(ias,false);setTimeout(scanReset,1);"/></p>
 </div>
 
 <!-- Save Settings -->
 <div class="side_box">
 <h2>Settings</h2>
 <p>
-<input name="set_save" size="15" onkeypress="if(event.which==13||event.keyCode==13){this.nextSibling.click();return false;}"><input onclick="if(this.previousSibling.value==''){return false;}else{document.scanning.removeAttribute('onsubmit');}" type="submit" name="saveas" value="Save">
+<input name="set_save" type="text" size="15" onkeypress="if(event.which==13||event.keyCode==13){this.nextSibling.click();return false;}"/><input onclick="if(this.previousSibling.value==''){return false;}else{document.scanning.removeAttribute('onsubmit');}" type="submit" name="saveas" value="Save" style="margin-left:5px;"/>
 </p>
 <p align="center">
 <?php

inc/style.php

@@ -534,7 +534,7 @@
 #scans.enable{
 	-moz-column-count: 3;
 	-moz-column-gap: 0;
-	/* broken tool-tips in opera, chrome, and safari */
+	/* broken tool-tips in opera, chrome, safari, and IE10 (IE10 also breaks some images) */
 	-webkit-column-count: 3; 
 	-webkit-column-gap: 0;
 	column-count: 3;
@@ -613,7 +613,7 @@
 #paper-list ul{
 	-moz-column-count: 3;
 	-moz-column-gap: 50px;
-	/* broken tool-tips in opera, messed up borders and broken tool-tips in chrome and safari
+	/* broken tool-tips in opera/IE10 (IE10 also broke a image), messed up borders and broken tool-tips in chrome and safari
 	-webkit-column-count: 3;
 	-webkit-column-gap: 50px;
 	column-count: 3;

index.php

@@ -301,7 +301,7 @@ function quit(){
 			$IMAGE=$FILES[$i];
 			include "inc/scans.php";
 		}
-		echo '</div><script type="text/javascript">if(document.body.style.WebkitColumnGap==""||document.body.style.MozColumnGap==""||document.body.style.columnGap=="")getID("scans").className="enable"+(document.body.style.WebkitColumnGap==""?" webkit":"");</script>';
+		echo '</div><script type="text/javascript">if(document.body.style.MozColumnGap==""||document.body.style.WebkitColumnGap==""/*||document.body.style.columnGap==""*/)getID("scans").className="enable"+(document.body.style.WebkitColumnGap==""?" webkit":"");</script>';
 	}
 	checkFreeSpace($FreeSpaceWarn);
 	Footer();
@@ -1106,12 +1106,12 @@ function quit(){
 echo '<script type="text/javascript">Debug("'.rawurlencode(html($debug)).html($here."$ ").'",'.(isset($_COOKIE["debug"])?$_COOKIE["debug"]:'false').');';
 if($CheckForUpdates){
 	$file="config/gitVersion.txt";
-	$time=is_file($time)?filemtime($file):time()/2;
+	$time=is_file($file)?filemtime($file):time()/2;
 	if($time+3600*24<time())
 		echo "updateCheck('$VER',null);";
 	else{
 		$file=file_get_contents($file);
-		if(version_compare($file,$VER))
+		if(version_compare($file,$VER)==1)
 			echo "updateCheck('$file',true);";
 	}
 }