Merge branch 'master' into prod

Author: lisamusing

index.php

@@ -4,17 +4,24 @@
 ini_set('display_errors', 0);
 
 $uri = $_SERVER['REQUEST_URI'];
+//echo "uri is: ".$uri."<br>";
 $base = dirname($_SERVER['SCRIPT_NAME']);
+//echo "base is: ".$base."<br>";
 $path = substr($uri, strlen($base));
+//echo "path is: ".$path."<br>";
 $parsedUrl = parse_url(basename($path));
+//echo "parsedUrl is: ";
+//var_dump ($parsedUrl);
+//echo "<br>";
 $requestedPage = $parsedUrl['path'];
+//echo "requestedPage is: ".$requestedPage."<br>";
 
 if (strtolower(substr($requestedPage, -5)) == '.html') {
-    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/') . substr($requestedPage, 0, -5), true, 301);
+    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/') . substr($requestedPage, 0, -5), true, 302);
     exit;
 }
 if (strtolower($requestedPage) == 'home' || strtolower($requestedPage) == 'index' || strtolower($requestedPage) == 'index.php') {
-    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/'), true, 301);
+    header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/'), true, 302);
     exit;
 }
 if (!$requestedPage) {

resources/home.html

@@ -27,7 +27,7 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
             </div>
             <div class="section">
                 <p>Inspired by conferences like Webstock and Brooklyn Beta, we want to make a friendly conference for us. Together with our friends and peers, we aim to inspire you to make great things with PHP.</p>
-                <p><a href="subscribe">Subscribe to our mailing list</a>, and we'll keep you updated on all the latest PHP Community Conference news and information.</p>
+		<p><a href="http://phpcon.eventbrite.com">Register now for only $350</a>. You'll receive: <ul><li>Two tutorials on the 21st</li><li>A full day of <a href="speakers">excellent speakers</a> on the 22nd</li><li>All your food, snacks, and conversation free</li></ol></p>                
             </div>
 
             <div class="sectionWide">