From 6c6fc12317d71a12eb5c74642210d43ee5c358f0 Mon Sep 17 00:00:00 2001
From: GM-Script-Writer-62850 <pqwoerituytrueiwoq@gmail.com>
Date: Wed, 10 Jul 2013 21:25:41 -0400
Subject: [PATCH] Enhancements

---
 inc/main.js   | 96 ++++++++++++++++++++++++++++++++-------------------
 inc/scan.php  |  2 +-
 inc/scans.php |  4 +--
 inc/style.php | 23 ++++++------
 index.php     |  4 +--
 5 files changed, 78 insertions(+), 51 deletions(-)

diff --git a/inc/main.js b/inc/main.js
index 22bce5f..d63def5 100755
--- a/inc/main.js
+++ b/inc/main.js
@@ -246,7 +246,7 @@ function printMsg(t,m,a,r){
 	var div=document.createElement('div');
 	var ele=getID('new_mes');
 	div.className="message";
-	div.innerHTML="<h2>"+t+'<a class="close icon tool del" onclick="this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);return false;" href="#"><span class="tip">Close</span></a>'+"</h2><div"+(a!='center'?' style="text-align:'+a+';"':'')+">"+m+"</div>";
+	div.innerHTML="<h2>"+t+'<a class="icon tool del" onclick="this.parentNode.parentNode.parentNode.removeChild(this.parentNode.parentNode);return false;" href="#"><span class="tip">Close</span></a>'+"</h2><div"+(a!='center'?' style="text-align:'+a+';"':'')+">"+m+"</div>";
 	if(r!=-1&& typeof ele.insertBefore=='function')
 		ele.insertBefore(div,ele.childNodes[0]);
 	else
@@ -777,6 +777,7 @@ function imgurPopup(file,links){
 		links=parseJSON(localStorage.getItem('imgur'));
 		links=links[file];
 	}
+	var onclick="void(setClipboard(this)?null:this.select());";//Only select if not copied
 	getID("blanket").childNodes[0].innerHTML='<h2 style="font-size:12px;">'+file.substr(5)+' is on Imgur</h2>'+
 		'<div id="imgur-data"><div><img id="'+encodeHTML(file)+'" style="float:left;margin-right:5px;" src="'+links['small_square']+'" width="90" height="90"/>'+
 		'<ul style="list-style:none;">'+
@@ -785,53 +786,60 @@ function imgurPopup(file,links){
 		'<li>Delete Link:<ul><li><a href="'+links['delete_page']+'" target="_blank">'+links['delete_page'].substr(7)+'</a></li></ul></li></ul></div>'+
 		'<h2 style="font-size:12px;" class="center">Embed Codes</h2><div id="imgur-scroller"><div></div></div><div id="imgur-codes">'+
 		'<div class="codes"><h2>Original</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['original']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['original']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['original']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['original']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['original']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['original']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['original']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['original']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['original']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['original']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['original']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes"><h2>Huge Thumbnail</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['huge_thumbnail']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['huge_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['huge_thumbnail']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['huge_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['huge_thumbnail']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['huge_thumbnail']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['huge_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['huge_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['huge_thumbnail']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['huge_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['huge_thumbnail']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes"><h2>Large Thumbnail</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['large_thumbnail']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['large_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['large_thumbnail']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['large_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['large_thumbnail']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['large_thumbnail']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['large_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['large_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['large_thumbnail']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['large_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['large_thumbnail']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes"><h2>Medium Thumbnail</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['medium_thumbnail']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['medium_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['medium_thumbnail']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['medium_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['medium_thumbnail']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['medium_thumbnail']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['medium_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['medium_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['medium_thumbnail']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['medium_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['medium_thumbnail']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes"><h2>Small Thumbnail</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['small_thumbnail']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['small_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['small_thumbnail']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['small_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['small_thumbnail']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['small_thumbnail']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['small_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['small_thumbnail']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['small_thumbnail']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['small_thumbnail']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['small_thumbnail']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes"><h2>Big Square</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['big_square']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['big_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['big_square']+'[/IMG]"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['big_square']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['big_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linked HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['big_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['big_square']+'[/IMG]"/></li></ul></li>'+
 		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['big_square']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['big_square']+')"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['big_square']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'<div class="codes" style="border: none;"><h2>Small Square</h2><ul>'+
-		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="'+links['small_square']+'"/></li></ul></li>'+
-		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['small_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot; /&gt;&lt;/a&gt;"/></li></ul></li>'+
-		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[IMG]'+links['small_square']+'[/IMG]"/></li></ul></li>'+
-		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['small_square']+'[/IMG][/URL]"/></li></ul></li>'+
-		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="this.select();" type="text" value="[Imgur]('+links['small_square']+')"/></li></ul></li>'+
+		'<li>Direct Link (email & IM)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="'+links['small_square']+'"/></li></ul></li>'+
+		'<li>HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;img src=&quot;'+links['small_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;"/></li></ul></li>'+
+		'<li>Linekd HTML Image (websites & blogs)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="&lt;a href=&quot;'+links['imgur_page']+'&quot;&gt;&lt;img src=&quot;'+links['small_square']+'&quot; alt=&quot;'+links['imgur_page']+'&quot; title=&quot;Hosted by imgur.com&quot;/&gt;&lt;/a&gt;"/></li></ul></li>'+
+		'<li>BBCode (message boards & forums)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[IMG]'+links['small_square']+'[/IMG]"/></li></ul></li>'+
+		'<li>Linked BBCode (message boards)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[URL='+links['imgur_page']+'][IMG]'+links['small_square']+'[/IMG][/URL]"/></li></ul></li>'+
+		'<li>Markdown Link (reddit comment)<ul><li><input readonly="readonly" onclick="'+onclick+'" type="text" value="[Imgur]('+links['small_square']+')"/></li></ul></li>'+
 		'</ul></div>'+
 		'</div></div><input type="button" value="Close" style="width:100%;" onclick="toggle(\'blanket\')"/>';
 	popup('blanket',365);
@@ -845,6 +853,7 @@ function imgurPopup(file,links){
 		getID('imgur-scroller').style.display='none';
 		getID('imgur-codes').style.overflowX='scroll';
 	}
+	return false;
 }
 function imgurDel(id,img){
 	if(img===false){
@@ -873,6 +882,23 @@ function imgurDel(id,img){
 	}
 	return false;
 }
+function setClipboard(e){// Everyone except MS considers this a security hole, thus this is IE only; I refuse to use flash as a workaround for this
+	if(!window.clipboardData)
+		return false;
+	if(window.clipboardData.setData('Text',e.value)){
+		var span=document.createElement('span');
+		span[TC]="Copied";
+		span.className="tip";
+		span.style.display="block";
+		e.parentNode.className="tool";
+		e.parentNode.appendChild(span);
+		setTimeout(function(){
+			e.parentNode.removeChild(span);
+		},1600);
+		return true;
+	}
+	return false;
+}
 function emailManager(file){
 	var storeSupport=(typeof localStorage=="object"&&typeof JSON=="object"?true:false),data=false;
 	if(file==null&&!storeSupport)
diff --git a/inc/scan.php b/inc/scan.php
index 3bc0af5..4f4878f 100755
--- a/inc/scan.php
+++ b/inc/scan.php
@@ -2,7 +2,7 @@
 <div id="select"></div>
 
 <div id="sidebar">
-<form name="scanning" action="index.php" onsubmit="return pre_scan(this,ias);" method="post">
+<form name="scanning" action="index.php" onsubmit="return pre_scan(this,ias);" method="POST">
 
 <div class="side_box">
 <h2>Scanners</h2>
diff --git a/inc/scans.php b/inc/scans.php
index 770cd00..0d94893 100755
--- a/inc/scans.php
+++ b/inc/scans.php
@@ -2,7 +2,7 @@
 echo html($FILE);
 ?>">
 <h2 ondblclick="toggleFile(this);" class="excluded"><?php echo html($FILE); ?></h2>
-<p>
+<p><span>
 <a class="tool icon download" href="download.php?file=Scan_<?php echo url($FILE); ?>"><span class="tip">Download</span></a>
 <a class="tool icon zip" href="download.php?file=Scan_<?php echo url($FILE); ?>&amp;compress"><span class="tip">Download Zip</span></a>
 <a class="tool icon pdf" href="#" onclick="return PDF_popup('<?php echo html(js($FILE)); ?>');"><span class="tip">Download PDF</span></a>
@@ -12,7 +12,7 @@
 <a class="tool icon view" href="index.php?page=View&amp;file=Scan_<?php echo url($FILE); ?>"><span class="tip">View</span></a>
 <a class="tool icon upload" href="#" onclick="return upload('Scan_<?php echo html(js($FILE)); ?>');"><span class="tip">Upload to Imgur</span></a>
 <a href="#" onclick="return emailManager('Scan_<?php echo html(js($FILE)); ?>');" class="tool icon email"><span class="tip">Email</span></a>
-<br/>
+</span><br/>
 <a class="tool" target="_blank" href="scans/Scan_<?php echo url($FILE); ?>" style="width:100%;"><img src="scans/<?php echo url($IMAGE); ?>" alt="<?php echo html($FILE); ?>" style="width:100%"/><span class="tip">View raw file</span></a>
 </p>
 </div>
diff --git a/inc/style.php b/inc/style.php
index 8bc875b..0f7320b 100755
--- a/inc/style.php
+++ b/inc/style.php
@@ -224,6 +224,14 @@
 	text-align: center;
 }
 
+h2 > .del {
+	float: right;
+	border: 1px #ffffff solid;
+	border-radius: 3px;
+	text-indent: 0;
+}
+
+
 .message {
 	border: 1px solid #aa0000;
 	padding: 0;
@@ -260,13 +268,6 @@
 	background: #ff0000;
 }
 
-.message h2 .close {
-	float: right;
-	border: 1px #ffffff solid;
-	border-radius: 3px;
-	text-indent: 0;
-}
-
 .message div {
 	text-align: center;
 	margin: 1em;
@@ -313,6 +314,10 @@
 	border: 1px solid #<?php echo $BG_COLOR; ?>;
 }
 
+p .icon:not(:last-child){
+	margin-right: 3px;
+}
+
 .zip-off {
 	background-position: 0 0;
 }
@@ -677,10 +682,6 @@
 	word-wrap: break-word;
 }
 
-#imgur-uploads h2 a {
-	float: right;
-}
-
 #imgur-uploads .box img {
 	width: 160px;
 	height: 160px;
diff --git a/index.php b/index.php
index d13f776..d89112d 100644
--- a/index.php
+++ b/index.php
@@ -320,7 +320,7 @@ function quit(){
 		Print_Message("No Images","All files have been removed. There are no scanned images to display.",'center');
 	}
 	else{
-		echo '<div class="box box-full"><h2>Bulk Operations</h2><p style="text-align:center;">'.
+		echo '<div class="box box-full"><h2>Bulk Operations</h2><p style="text-align:center;"><span>'.
 			'<a onclick="return false" class="tool icon download-off" href="#"><span class="tip">Download (Disabled)</span></a> '.
 			'<a onclick="return bulkDownload(this,\'zip\')" class="tool icon zip" href="#"><span class="tip">Download Zip</span></a> '.
 			'<a onclick="return PDF_popup(filesLst)" class="tool icon pdf" href="#"><span class="tip">Download PDF</span></a> '.
@@ -330,7 +330,7 @@ function quit(){
 			'<a onclick="return bulkView(this)" class="tool icon view" href="#"><span class="tip">View</span></a> '.
 			'<a onclick="return bulkUpload()" class="tool icon upload" href="#"><span class="tip">Upload to Imgur</span></a> '.
 			'<a onclick="return emailManager(\'Scan_Compilation\')" class="tool icon email" href="#"><span class="tip">Email</span></a>'.
-			'<br/>Double Click a file name to select/deselect it<br/>'.
+			'</span><br/>Double Click a file name to select/deselect it<br/>'.
 			'The order they are selected determines the page order<br/>'.
 			'<button onclick="return selectScans(\'excluded\');">Select All</button> '.
 			'<button onclick="return selectScans(false);">Invert Selection</button> '.