Skip to content

Commit fbea4ca

Browse files
ramseyramsey
committed
Move 2011 conference pages into a 2011/ directory.
1 parent dbf0a12 commit fbea4ca

File tree

10 files changed

+50
-55
lines changed

10 files changed

+50
-55
lines changed

‎.htaccess

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
1+
Redirect temp /about /2011/about
2+
Redirect temp /location /2011/location
3+
Redirect temp /schedule /2011/schedule
4+
Redirect temp /speakers /2011/speakers
5+
Redirect temp /sponsorships /2011/sponsorships
6+
Redirect temp /subscribe /2011/subscribe
7+
18
<IfModule mod_rewrite.c>
29
RewriteEngine On
310
#RewriteBase /~ramsey/phpcon-web/

‎index.php

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,10 @@
44
ini_set('display_errors', 0);
55

66
$uri = $_SERVER['REQUEST_URI'];
7-
//echo "uri is: ".$uri."<br>";
87
$base = dirname($_SERVER['SCRIPT_NAME']);
9-
//echo "base is: ".$base."<br>";
108
$path = substr($uri, strlen($base));
11-
//echo "path is: ".$path."<br>";
12-
$parsedUrl = parse_url(basename($path));
13-
//echo "parsedUrl is: ";
14-
//var_dump ($parsedUrl);
15-
//echo "<br>";
9+
$parsedUrl = parse_url($path);
1610
$requestedPage = $parsedUrl['path'];
17-
//echo "requestedPage is: ".$requestedPage."<br>";
1811

1912
if (strtolower(substr($requestedPage, -5)) == '.html') {
2013
header('Location: ' . $base . (substr($base, -1) == '/' ? '' : '/') . substr($requestedPage, 0, -5), true, 302);
@@ -27,7 +20,10 @@
2720
if (!$requestedPage) {
2821
$requestedPage = 'home';
2922
}
30-
if (!ctype_alnum($requestedPage)) {
23+
if (preg_match('/^(\d{4})\/?$/', $requestedPage, $matches)) {
24+
$requestedPage = $matches[1] . '/home';
25+
}
26+
if (!preg_match('/[A-Za-z0-9\/]/', $requestedPage)) {
3127
$requestedPage = '404';
3228
}
3329

‎resources/about.html renamed to ‎resources/2011/about.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ <h1>PHP Community
99
<span>Conference</span></h1>
1010
<div id="nav">
1111
<ul>
12-
<li><a href="home">Home</a></li>
13-
<li><a href="schedule">Schedule</a></li>
14-
<li><a href="location">Location</a></li>
12+
<li><a href="2011/home">Home</a></li>
13+
<li><a href="2011/schedule">Schedule</a></li>
14+
<li><a href="2011/location">Location</a></li>
1515
<li>About</li>
1616
</ul>
1717
</div>

‎resources/home.html renamed to ‎resources/2011/home.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ <h3>Nashville,<span>&nbsp;</span>TN</h3>
1515
<div id="nav">
1616
<ul>
1717
<li>Home</li>
18-
<li><a href="schedule">Schedule</a></li>
19-
<li><a href="location">Location</a></li>
20-
<li><a href="about">About</a></li>
18+
<li><a href="2011/schedule">Schedule</a></li>
19+
<li><a href="2011/location">Location</a></li>
20+
<li><a href="2011/about">About</a></li>
2121
</ul>
2222
</div>
2323
</div>

‎resources/location.html renamed to ‎resources/2011/location.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ <h1>PHP Community
88
<span>Conference</span></h1>
99
<div id="nav">
1010
<ul>
11-
<li><a href="home">Home</a></li>
12-
<li><a href="schedule">Schedule</a></li>
11+
<li><a href="2011/home">Home</a></li>
12+
<li><a href="2011/schedule">Schedule</a></li>
1313
<li>Location</li>
14-
<li><a href="about">About</a></li>
14+
<li><a href="2011/about">About</a></li>
1515
</ul>
1616
</div>
1717
<div id="social">

‎resources/schedule.html renamed to ‎resources/2011/schedule.html

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ <h1>PHP Community
88
<span>Conference</span></h1>
99
<div id="nav">
1010
<ul>
11-
<li><a href="home">Home</a></li>
11+
<li><a href="2011/home">Home</a></li>
1212
<li>Schedule</li>
13-
<li><a href="location">Location</a></li>
14-
<li><a href="about">About</a></li>
13+
<li><a href="2011/location">Location</a></li>
14+
<li><a href="2011/about">About</a></li>
1515
</ul>
1616
</div>
1717
<div id="social">
@@ -51,11 +51,11 @@ <h1>PHP Community
5151
<td class="hour">10</td>
5252
<td class="minute">00</td>
5353
<td rowspan="12"><a
54-
href="speakers/#mitchell">Lorna Mitchell
54+
href="2011/speakers#mitchell">Lorna Mitchell
5555
- Web Services</a></td>
56-
<td rowspan="12"><a href="speakers/#ophinney">Matthew Weier O'Phinney - Mastering
56+
<td rowspan="12"><a href="2011/speakers#ophinney">Matthew Weier O'Phinney - Mastering
5757
Zend Framework 2 Patterns</a></td>
58-
<td colspan="2" rowspan="4"><a href="speakers/#lerdorf">Rasmus Lerdorf - Opening
58+
<td colspan="2" rowspan="4"><a href="2011/speakers#lerdorf">Rasmus Lerdorf - Opening
5959
Keynote</a></td>
6060
</tr>
6161
<tr>
@@ -82,9 +82,9 @@ <h1>PHP Community
8282
<tr>
8383
<td class="hour">11</td>
8484
<td class="minute">30</td>
85-
<td width="25%" rowspan="3"><a href="speakers/#moon">Brian Moon -
85+
<td width="25%" rowspan="3"><a href="2011/speakers#moon">Brian Moon -
8686
Phorum</a></td>
87-
<td width="25%" rowspan="3"><a href="speakers/#mclellan">Drew Mclellan - The Original Hypertext
87+
<td width="25%" rowspan="3"><a href="2011/speakers#mclellan">Drew Mclellan - The Original Hypertext
8888
Preprocessor</a></td>
8989
</tr>
9090
<tr>
@@ -116,9 +116,9 @@ <h1>PHP Community
116116
<tr>
117117
<td class="hour">13</td>
118118
<td class="minute">15</td>
119-
<td rowspan="3"><a href="speakers/#finkler">Ed Finkler
119+
<td rowspan="3"><a href="2011/speakers#finkler">Ed Finkler
120120
- The Story of Spaz</a></td>
121-
<td rowspan="3"><a href="speakers/#reinheimer">Paul Reinheimer - XHProf &amp;
121+
<td rowspan="3"><a href="2011/speakers#reinheimer">Paul Reinheimer - XHProf &amp;
122122
Wonderproxy</a></td>
123123
</tr>
124124
<tr>
@@ -132,9 +132,9 @@ <h1>PHP Community
132132
<tr>
133133
<td class="hour">14</td>
134134
<td class="minute">00</td>
135-
<td rowspan="12"><a href="speakers/#securityoverride">Helgi Þorbjörnsson - Frontend Caching:
135+
<td rowspan="12"><a href="2011/speakers#securityoverride">Helgi Þorbjörnsson - Frontend Caching:
136136
The New Frontier</a></td>
137-
<td rowspan="12"><a href="speakers/#perras">Jöel Perras
137+
<td rowspan="12"><a href="2011/speakers#perras">Jöel Perras
138138
- Lithium</a></td>
139139
<td rowspan="2" colspan="2" class="break">Break</td>
140140
</tr>
@@ -145,9 +145,9 @@ <h1>PHP Community
145145
<tr>
146146
<td class="hour">14</td>
147147
<td class="minute">30</td>
148-
<td rowspan="3"><a href="speakers/#denker">Laura Beth Lincoln Denker - Is It
148+
<td rowspan="3"><a href="2011/speakers#denker">Laura Beth Lincoln Denker - Is It
149149
Handmade Code If You Use Power Tools?</a></td>
150-
<td rowspan="3"><a href="speakers/#coates">Sean Coates - Gimme Bar</a></td>
150+
<td rowspan="3"><a href="2011/speakers#coates">Sean Coates - Gimme Bar</a></td>
151151
</tr>
152152
<tr>
153153
<td class="hour">14</td>
@@ -169,10 +169,10 @@ <h1>PHP Community
169169
<tr>
170170
<td class="hour">15</td>
171171
<td class="minute">45</td>
172-
<td rowspan="3"><a href="speakers/#zmievski">Andrei Zmievski - The Good, The Bad
172+
<td rowspan="3"><a href="2011/speakers#zmievski">Andrei Zmievski - The Good, The Bad
173173
&amp; The Ugly: What Happened to Unicode in PHP
174174
6</a></td>
175-
<td rowspan="3"><a href="speakers/#esser">Marcel Esser - From Earth to Jupiter
175+
<td rowspan="3"><a href="2011/speakers#esser">Marcel Esser - From Earth to Jupiter
176176
With NASA</a></td>
177177
</tr>
178178
<tr>
@@ -197,7 +197,7 @@ <h1>PHP Community
197197
<td class="minute">00</td>
198198
<td rowspan="12" colspan="2"></td>
199199
<td rowspan="4" colspan="2"><a
200-
href="speakers/#chay">Terry Chay - Closing
200+
href="2011/speakers#chay">Terry Chay - Closing
201201
Keynote</a></td>
202202
</tr>
203203
<tr>

‎resources/speakers.html renamed to ‎resources/2011/speakers.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ <h1>PHP Community
88
<span>Conference</span></h1>
99
<div id="nav">
1010
<ul>
11-
<li><a href="home">Home</a></li>
12-
<li><a href="schedule">Schedule</li>
13-
<li><a href="location">Location</a></li>
14-
<li><a href="about">About</a></li>
11+
<li><a href="2011/home">Home</a></li>
12+
<li><a href="2011/schedule">Schedule</li>
13+
<li><a href="2011/location">Location</a></li>
14+
<li><a href="2011/about">About</a></li>
1515
</ul>
1616
</div>
1717
<div id="social">

‎resources/sponsorships.html renamed to ‎resources/2011/sponsorships.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ <h1>PHP Community
99
<span>Conference</span></h1>
1010
<div id="nav">
1111
<ul>
12-
<li><a href="home">Home</a></li>
13-
<li><a href="schedule">Schedule</a></li>
14-
<li><a href="location">Location</a></li>
15-
<li><a href="about">About</a></li>
12+
<li><a href="2011/home">Home</a></li>
13+
<li><a href="2011/schedule">Schedule</a></li>
14+
<li><a href="2011/location">Location</a></li>
15+
<li><a href="2011/about">About</a></li>
1616
</ul>
1717
</div>
1818
<div id="social">

‎resources/subscribe.html renamed to ‎resources/2011/subscribe.html

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ <h1>PHP Community
99
<span>Conference</span></h1>
1010
<div id="nav">
1111
<ul>
12-
<li><a href="home">Home</a></li>
13-
<li><a href="schedule">Schedule</a></li>
14-
<li><a href="location">Location</a></li>
15-
<li><a href="about">About</a></li>
12+
<li><a href="2011/home">Home</a></li>
13+
<li><a href="2011/schedule">Schedule</a></li>
14+
<li><a href="2011/location">Location</a></li>
15+
<li><a href="2011/about">About</a></li>
1616
</ul>
1717
</div>
1818
<div id="social">

‎resources/404.html

100755100644
Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,6 @@
77
<div class="header">
88
<h1>PHP Community
99
<span>Conference</span></h1>
10-
<div id="nav">
11-
<ul>
12-
<li><a href="home">Home</a></li>
13-
<li><a href="schedule">Schedule</a></li>
14-
<li><a href="location">Location</a></li>
15-
<li><a href="about">About</a></li>
16-
</ul>
17-
</div>
1810
<div id="social">
1911
<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.phpcon.org%2F&amp;layout=button_count&amp;show_faces=false&amp;width=80&amp;action=like&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:80px; height:21px;" allowTransparency="true" id="fbLike"></iframe>
2012
<p class="twitter">Follow Us: <a href="http://twitter.com/phpcomcon">PHPCOMCON</a></p>

0 commit comments

Comments
 (0)