Merge branch 'master' into website/svn-to-git

Author: cjakeman

contact/index.php

@@ -23,7 +23,7 @@
       </div>
 			<div class="col-md-6">
         <!-- send this to another host as uktrainsim doesn't support mail() -->
-        <form role="form" action="http://wepp.co.uk/openrails/forward_message.php" method="get">
+        <form role="form" action="http://ccgi.jakeman.plus.com/or/forward_message.php" method="get">
           <div class="form-group">
             <label for="emailAddress">Email address</label>
             <input type="email" class="form-control" id="emailAddress" name="from" placeholder="Enter your email address. (We do not share this.)" autofocus required>
@@ -32,9 +32,11 @@
             <label for="emailSubject">Subject</label>
             <input type="text" class="form-control" id="emailSubject" name="subject" placeholder="Enter your subject">
           </div>
-    			<input type = "hidden" name="send_to_name"   value="or_website">
-		    	<input type = "hidden" name="send_to_domain" value="jakeman.plus.com">
-			    <input type = "hidden" name="success_url"    value="http://openrails.org/contact/success.php"> 
+    			<input type="hidden" name="send_to_name"   value="or_website">
+		    	<input type="hidden" name="send_to_domain" value="jakeman.plus.com">
+			    <input type="hidden" name="success_url"    value="http://openrails.org/contact/success.php"> 
+		    	<?php $ip = $_SERVER['REMOTE_ADDR']; echo "<input type='hidden' name='ip' value='$ip'>" ?>
+		    	<?php $referer = $_SERVER['HTTP_REFERER']; echo "<input type='hidden' name='referer' value='$referer'>" ?>
           <div class="form-group">
             <label for="emailMessage">Message</label>
             <textarea class="form-control" rows="10" id="emailMessage" name="body" placeholder="Enter your message" required title="Please follow the guidance to the left about reporting problems."></textarea>

trade/index.php

@@ -40,7 +40,7 @@
   <li><a href="http://pikku.msts.cz/openrails.html">Pikku Locomotive Works</a> - Czechoslovakia</li>
   <li><a href="http://www.trainsimulations.net/">TrainSimulations</a> - Canada</li>
   <li><a href="http://www.gabriele90.com/">Gabriele 90</a> - Italy</li>
-  <li><a href=http://broadgaugeproduction.com/">Broad Gauge Productions</a> - India</li>  
+  <li><a href="http://broadgaugeproduction.com/">Broad Gauge Productions</a> - India</li>  
 </ul>
 <p>&nbsp;</p>
 <h2>Vendors Supporting MSTS</h2>