v0.2.2

LICENSE

@@ -26,7 +26,7 @@ SOFTWARE.
 
 MIT License
 
-Copyright (c) 2017 mikrohash.de
+Copyright (c) 2017 iotaspam.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

index.html

@@ -10,7 +10,7 @@
     <script type="text/javascript" src="js/iota.min.js"></script>
     <script type="text/javascript" src="js/curl.min.js"></script>
     <script type="text/javascript" src="js/EventEmitter.min.js"></script>
-    <script type="text/javascript" src="js/transactionSpammer.js"></script>
+    <script type="text/javascript" src="js/spammer.js"></script>
     <script type="text/javascript" src="js/main.js"></script>
     <script type="text/javascript" src="js/spamfund.js"></script>
     <script type="text/javascript" src="js/ajax.js"></script>
@@ -63,7 +63,7 @@ <h1>Project Licenses</h1>
 
 <pre id="lic2">MIT License
 
-Copyright (c) 2017 mikrohash.de
+Copyright (c) 2017 iotaspam.com
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -89,14 +89,15 @@ <h1>Project Licenses</h1>
 
 		<div id="page2" class="hidden">
 			<h1>Your Login Data</h1>
-			<p>If you haven't signed up yet, visit the <a href="https://mikrohash.de/iota/spamfund/signup" target="_blank">project website</a> to do so. All rewards will be credited to your account first - so you can later request to be paid out to your IOTA wallet.</p>
+			<p>If you haven't signed up yet, visit the <a href="http://iotaspam.com/signup" target="_blank">project website</a> to do so. All rewards will be credited to your account first - so you can later request to be paid out to your IOTA wallet.</p>
 			<hr/>
 			<input type="text" id="email" placeholder="email address" value="">
 			<input type="text" id="password" placeholder="password" value="">
 			<div class="button" onclick="nextPageButtonClicked();">Start Spamming Session!</div>
 			<hr/>
-			<label><input type="checkbox" id="use_own_node_list"> use your own node list instead of the one provided by us</label>
+			<label><input type="checkbox" id="use_own_node_list"> use your own node list instead of the one provided by us. <br/></label>
 			<textarea id="own_node_list" placeholder="http://node1.example.com:12345, http://node2.example.com:14625"></textarea>
+			Make sure to add at least one node of the protocol you are going to use (<label id="protocol">http or https</label>).
 		</div>
 
 
@@ -147,7 +148,7 @@ <h3>Transaction Log:</h3>
 	<div id="pattern_reverse"></div>
 	<footer>
 		<p>
-			<a href="https://mikrohash.de/iota/spamfund" target="_blank">&rarr; official project website</a> |
+			<a href="http://iotaspam.com/" target="_blank">&rarr; official project website</a> |
 			<a href="https://prizz.github.io/iota-transaction-spammer-webapp/">&rarr; original spammer by Peter Ryszkiewicz</a>
 		</p>
 		<hr/>
@@ -168,11 +169,11 @@ <h3>Transaction Log:</h3>
 				<td> &nbsp; &nbsp; &nbsp; </td>
 				<td>&hearts;</td>
 				<td> &nbsp; &nbsp; &nbsp; </td>
-				<td class="mono">15MhG7ELC6vX4ik3DseVHX9oRMJZbuzGC6</td>
+				<td class="mono">18JBorM1J99Cr1M488HPLyaN1jxFUrfnMq</td>
 			</tr>
 		</table>
 		<hr/>
-		<p>Contact me on <b>[email protected]</b></p>
+		<p>Contact us on <b>[email protected]</b></p>
 	</footer>
     <script type="text/javascript" src="js/init.js"></script>
 </body>

js/init.js

@@ -1,10 +1,20 @@
-// === download information from spam fund website ===
-
 sendAjaxRequest({mode: 'check_update', version: '0.2'}, onUpdateChecked);
 
 if(window.IOTA === undefined) {
-	$('#content').html("<h1>Sorry to interrupt you!</h1><p>We couldn't find 'js/iota.min.js'. Please follow the instructions provided in our 'README.md' file to find out what to do.</p>");
+	var iotaLibMissingText = "<h1>One last step</h1><p>You have to add 'js/iota.min.js' to the project. Just follow these instructions:</p>"
+		+ "<ol><li>visit <a href='https://raw.githubusercontent.com/iotaledger/iota.lib.js/master/dist/iota.min.js' target='_blank'>https://raw.githubusercontent.com/iotaledger/iota.lib.js/master/dist/iota.min.js</a> <sup>1</sup></li>"
+		+ "<li>download the shown file (press CTRL+S in Firefox/Chrome) <sup>1</sup> and name it 'iota.min.js'</li>"
+		+ "<li>move the downloaded file into the directory '/js/'</li></ol>"
+		+ "<hr/><p><sup>1</sup> ... Alternatively, if this is not working for you, you can get the file this way as well:</p>"
+		+ "<ol><li>visit <a href='https://github.com/iotaledger/iota.lib.js' target='_blank'>https://github.com/iotaledger/iota.lib.js</a></li>"
+		+ "<li>download the whole repository .zip file</li>"
+		+ "<li>you will find the 'iota.min.js' in '/dist/'</li>";
+
+	$('#content').html(iotaLibMissingText);
+}
+
+if(document.URL === "https://mikrohash.de/iota/spamfund/demo" || document.URL === "https://mikrohash.de/iota/spamfund/demo/" || document.URL === "https://www.mikrohash.de/iota/spamfund/demo" || document.URL === "https://www.mikrohash.de/iota/spamfund/demo/") {
+	alert("This is the online demo. Do not use this for regular spamming, since you will only be able to connect to two nodes.");
 }
 
-//nextPageButtonClicked();
-//nextPageButtonClicked();
+$('#protocol').html(isRunningOverHTTPS()?"<b>https</b> not <s>http</s>":"<b>http</b> not <s>https</s>");

js/spamfund.js

@@ -129,5 +129,5 @@ function updateColors() {
 	$('#pattern_reverse').css("background-image", "url('./imgs/pattern_reverse"+color[colorScheme][8]+".png')");
 	$('header img').attr("src", "./imgs/iota"+color[colorScheme][8]+".png");
 
-	$('#content').css("color", color[colorScheme][5]);
+	$('#content, #content a').css("color", color[colorScheme][5]);
 }