/challenge/index.php |
---|
File deleted |
/challenge/00-do.php |
---|
File deleted |
/challenge/00.php |
---|
File deleted |
/challenge/01.php |
---|
File deleted |
/blog/add-post.php |
---|
40,7 → 40,7 |
} |
else |
{ |
if ($page->getLoggedInUser()->accessID >= 2 && $parentID == -1) |
if (($page->getLoggedInUser()->accessID >= 2 && $parentID == -1) || $page->getLoggedInUser()->accessID > 2) |
{ |
$page->drawError('You do not have permission to access this page.'); |
} |
/blog/del-post.php |
---|
7,7 → 7,7 |
$id = $_GET['id']; |
if ($id) |
{ |
if ($page->isUserAdmin($page->getLoggedInUser()) || $page->getLoggedInUser()->ID == $page->getBlogPost($id)->author->ID) |
if ($page->isUserAdmin($page->getLoggedInUser()) || $page->getLoggedInUser()->ID == $page->getBlogPost($id)->author->ID && $page->isUserNormal($page->getLoggedInUser())) |
{ |
$page->delBlogPost($id); |
} |
/blog/edit-post.php |
---|
20,7 → 20,7 |
$page->checkLoggedIn(); |
$post = $page->getBlogPost($id); |
if (!$page->isUserAdmin($page->getLoggedInUser()) && $page->getLoggedInUser()->ID != $post->author->ID) |
if ((!$page->isUserAdmin($page->getLoggedInUser()) && $page->getLoggedInUser()->ID != $post->author->ID) || !$page->isUserNormal($page->getLoggedInUser())) |
{ |
$page->drawError('You do not have permission to access this page.'); |
} |
/blog/rss.php |
---|
0,0 → 1,34 |
<?php |
require '../_taios.php'; |
header("Content-type: application/rss+xml"); |
$page = new Taios_Page('Blog RSS Feed', '../'); |
write('<?xml version="1.0" encoding="UTF-8" ?>'); |
write('<rss version="2.0">'); |
write('<channel>'); |
write('<title>Tim32 Blog RSS</title>'); |
write('<description>This is the RSS feed for the Tim32 Blog.</description>'); |
write('<link>http://tim32.org/blog/</link>'); |
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC'); |
for ($i = 0; $i < count($ids); $i++) |
{ |
$id = $ids[$i]; |
$post = $page->getBlogPost($id); |
write('<item>'); |
write('<title>' . $post->title . '</title>'); |
write('<link>http://tim32.org/blog/post.php?id=' . $id . '</link>'); |
write('<guid>' . $id . '</guid>'); |
write('<pubDate>' . date('D, d M Y H:i:s O', $post->datePosted). '</pubDate>'); |
write('<description><![CDATA[' . $page->replaceBBCode($post->content) . ']]></description>'); |
write('</item>'); |
} |
write('</channel>'); |
write('</rss>'); |
?> |
/blog/index.php |
---|
5,6 → 5,8 |
$page = new Taios_Page('Blog Posts', '../'); |
$page->drawHeader(); |
$page->drawBlogCategoriesMenu(); |
write('<br /><h3>RSS</h3>'); |
$page->drawMenuItem('RSS Feed', 'blog/rss.php'); |
$page->drawMiddle(); |
if ($page->isUserGM($page->getLoggedInUser())) |
/admin/account-do.php |
---|
13,7 → 13,7 |
$name = $_POST['name']; |
$user = $page->getUserByID($userID); |
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user) |
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user && $page->isUserNormal($page->getLoggedInUser())) |
{ |
if (isset($accessID) && $page->isUserAdmin($page->getLoggedInUser())) |
{ |
/admin/account.php |
---|
11,7 → 11,7 |
$userID = $page->getGetID(); |
$user = $page->getUserByID($userID); |
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user) |
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user && $page->isUserNormal($page->getLoggedInUser())) |
{ |
?> |
/admin/index.php |
---|
9,7 → 9,14 |
$page->checkLoggedIn(); |
$user = $page->getLoggedInUser(); |
write('<h4><a href="account.php?id=' . $user->ID. '">Manage Account</a></h4>'); |
if ($page->isUserNormal($user)) |
{ |
write('<h4><a href="account.php?id=' . $user->ID. '">Manage Account</a></h4>'); |
} |
else |
{ |
$page->drawError('You do not have permission to access this page.'); |
} |
if ($page->isUserAdmin($user)) |
{ |
/admin/all-blog-posts.php |
---|
27,24 → 27,28 |
$ids = $page->findIDs('BlogPosts', 'ORDER BY DatePosted DESC'); |
for ($i = 0; $i < count($ids); $i++) |
{ |
$post = $page->getBlogPost($ids[$i]); |
write('<tr>'); |
write('<td><a href="../blog/edit-post.php?id=' . $post->ID . '">' . $post->ID . '</a></td>'); |
if ($post->parent == -1) |
$id_str = $ids[$i]; |
if (!empty($id_str)) |
{ |
write('<td style="color: #444444;">No Parent</td>'); |
$post = $page->getBlogPost($id_str); |
write('<tr>'); |
write('<td><a href="../blog/edit-post.php?id=' . $post->ID . '">' . $post->ID . '</a></td>'); |
if ($post->parent == -1) |
{ |
write('<td style="color: #444444;">No Parent</td>'); |
} |
else |
{ |
write('<td>' . $post->parent->title . '</td>'); |
} |
write('<td><a href="account.php?id=' . $post->author->ID . '">' . $post->author->name . '</a></td>'); |
write('<td>' . $post->title . '</td>'); |
write('<td>' . str_replace("\n", '<br />', $post->content) . '</td>'); |
write('<td>' . date('j/m/Y H:i', $post->datePosted) . '</td>'); |
write('<td>' . $post->category . '</td>'); |
write('<td>' . $post->spam . '</td>'); |
write('</tr>'); |
} |
else |
{ |
write('<td>' . $post->parent->title . '</td>'); |
} |
write('<td><a href="account.php?id=' . $post->author->ID . '">' . $post->author->name . '</a></td>'); |
write('<td>' . $post->title . '</td>'); |
write('<td>' . str_replace("\n", '<br />', $post->content) . '</td>'); |
write('<td>' . date('j/m/Y H:i', $post->datePosted) . '</td>'); |
write('<td>' . $post->category . '</td>'); |
write('<td>' . $post->spam . '</td>'); |
write('</tr>'); |
} |
write('</table>'); |
/_taios.php |
---|
34,7 → 34,8 |
write('<head>'); |
write('<meta http-equiv="Content-Type" content="text/html;charset=utf-8">'); |
write('<title>Tim32 · ' . $this->title . '</title>'); |
write('<link href="' . $this->url . 'styles.css" rel="stylesheet" type="text/css" media="screen">'); |
write('<link href="' . $this->url . 'styles.css" rel="stylesheet" type="text/css" media="screen" />'); |
write('<link rel="shortcut icon" href="' . $this->url . 'data/favicon.png" />'); |
write('</head>'); |
write('<body>'); |
write('<div class="sidebar">'); |
49,11 → 50,17 |
$this->drawMenuItem('Wiki', 'wiki/'); |
$this->drawMenuItem('Photos', 'photos/'); |
write('<br />'); |
if ($this->isLoggedIn()) |
if ($this->isLoggedIn() && $this->isUserNormal($this->getLoggedInUser())) |
{ |
$this->drawMenuItem('Administration', 'admin/'); |
$this->drawMenuItem('Logout', 'logout-do.php'); |
} |
else if ($this->isLoggedIn()) |
{ |
$this->drawMenuItem('Logout', 'logout-do.php'); |
if ($this->getLoggedInUser()->username != "cake") |
$this->drawMenuItem('You are banned', NULL); |
} |
else |
{ |
$this->drawMenuItem('Login', 'login.php'); |
60,7 → 67,6 |
$this->drawMenuItem('Register', 'register.php'); |
} |
write('<br />'); |
$this->drawnHeader = true; |
} |
} |
67,7 → 73,14 |
function drawMenuItem($t, $u) |
{ |
write('<p><a href="' . $this->url . $u . '">' . $t . '</a></p>'); |
if($u == NULL) |
{ |
write('<p style="color:red">' . $t . '</p>'); |
} |
else |
{ |
write('<p><a href="' . $this->url . $u . '">' . $t . '</a></p>'); |
} |
} |
function drawMiddle() |
88,7 → 101,7 |
{ |
if (!$this->drawnFooter) |
{ |
write('<br /><p class="copyright">© 2011 Tim32 · <a href="http://validator.w3.org/check?uri=http%3A%2F%2Ftim32.org%2F">HTML5 Valid</a></p>'); |
write('<br /><p class="copyright">Tim32</p>'); |
write('</div>'); |
write('</body>'); |
write('</html>'); |
170,9 → 183,22 |
function replaceBBCode($str) |
{ |
$newstr = str_replace("<", "[", $str); |
/*$newstrarray = explode("\n", $str); |
$newstr = ""; |
foreach ($newstrarray as $line) |
{ |
if ($line == "\n" || $line == " \n" || $line == "\n " || $line == "\n\r") |
{ |
$line = "</p><p>"; |
} |
$newstr .= ($line . "\n"); |
}*/ |
$newstr = $str; |
$newstr = str_replace("<", "[", $newstr); |
$newstr = str_replace(">", "]", $newstr); |
$newstr = str_replace("\n", '</p><p>', $newstr); |
$newstr = str_replace("\n", "</p><p>", $newstr); |
$newstr = str_replace("\\'", "'", $newstr); |
$newstr = str_replace("\\\"",'"', $newstr); |
$newstr = str_replace(' ', ' ', $newstr); |
196,7 → 222,11 |
'/\[url\](.+?)\[\/url\]/is', |
'/\[url=(.+?)\](.+?)\[\/url\]/is', |
'/\[code\](.+?)\[\/code\]/is', |
'/\[img\](.+?)\[\/img\]/is' |
'/\[img\](.+?)\[\/img\]/is', |
'/\[ul\](.+?)\[\/ul\]/is', |
'/\[ol\](.+?)\[\/ol\]/is', |
'/\[li\](.+?)\[\/li\]/is', |
'/\[mono\](.+?)\[\/mono\]/is' |
); |
$html = array( |
206,7 → 236,11 |
'<a href="$1">$1</a>', |
'<a href="$1">$2</a>', |
'<div class="code">$1</div>', |
'<img src="$1" />' |
'<img src="$1" />', |
'<ul>$1</ul>', |
'<ol>$1</ol>', |
'<li>$1</li>', |
'<span style="font-family: Droid Sans Mono, monospace, fixed; margin-left: 1em; margin-right: 1em;">$1</span>', |
); |
$newstr = preg_replace($bbcode, $html, $newstr); |
278,6 → 312,19 |
return false; |
} |
function isUserBanned() |
{ |
if ($this->isLoggedIn()) |
{ |
if ($this->getLoggedInUser()->accessID >= 3) |
{ |
return true; |
} |
} |
return false; |
} |
function checkChallengeStatus($challengeID, $previous, $next) |
{ |
$currentChallengeID = $this->getLoggedInUser()->challengeID; |
505,6 → 552,7 |
public $password; |
public $emailAddress; |
public $name; |
public $challengeID; |
} |
526,6 → 574,8 |
public $author; |
public $title; |
public $description; |
public $logoURL; |
public $downloadURL; |
public $websiteURL; |
539,6 → 589,7 |
public $parent; |
public $title; |
public $description; |
} |
class ForumPost |
/forums/add-post-do.php |
---|
20,6 → 20,11 |
$title = $_POST['title']; |
$content = $_POST['content']; |
if (!$page->isUserNormal($page->getLoggedInUser())) |
{ |
$page->redirect('add-post.php?error=You do not have permission to access this page'); |
} |
if (empty($title)) |
{ |
$page->redirect('add-post.php?error=No Title Specified'); |
/forums/add-post.php |
---|
20,7 → 20,7 |
$categoryID = -1; |
} |
if ($page->isLoggedIn()) |
if ($page->isLoggedIn() && $page->isUserNormal($page->getLoggedInUser)) |
{ |
if (isset($_GET['error'])) |
/forums/delete-post-do.php |
---|
9,7 → 9,7 |
$id = $page->getGetID(); |
$post = $page->getForumPost($id); |
if (($page->isUserAdmin($page->getLoggedInUser()) || $post->author->ID == $page->getLoggedInUser()->ID) && $post) |
if (($page->isUserAdmin($page->getLoggedInUser()) || $post->author->ID == $page->getLoggedInUser()->ID) && $post && $page->isUserNormal($page->getLoggedInUser())) |
{ |
$page->query('DELETE FROM ForumPosts WHERE ID = ' . $id); |
$page->redirect('index.php'); |
/forums/index.php |
---|
24,7 → 24,7 |
{ |
write('<a href="index.php?parentID=-1">Back to root</a>'); |
} |
if ($page->isLoggedIn()) |
if ($page->isLoggedIn() && $page->isUserNormal($page->getLoggedInUser())) |
{ |
if ($parentID != -1) |
{ |
/wiki/pages/Index.txt |
---|
File deleted |
Property changes: |
Deleted: svn:executable |
## -1 +0,0 ## |
-* |
\ No newline at end of property |
Index: wiki/index.php |
=================================================================== |
--- wiki/index.php (revision 398) |
+++ wiki/index.php (revision 471) |
@@ -42,7 +42,7 @@ |
if ($page->isUserGM($page->getLoggedInUser())) |
{ |
- write(' '); |
+ write(' '); |
} |
$filename = 'pages/' . $pageName . '.txt'; |
/styles.css |
---|
3,7 → 3,7 |
color: #000000; |
font-family: Droid Sans, Tahoma, sans-serif; |
font-size: 11pt; |
font-size: 10pt; |
margin: 0px; |
padding: 0px; |
46,7 → 46,7 |
} |
p, table, span { |
font-size: 11pt; |
font-size: 10pt; |
margin: 8px; |
margin-left: 16px; |
} |
91,13 → 91,18 |
} |
.sidebar { |
top: 0px; |
left: 0px; |
position: fixed; |
float: left; |
width: 146px; |
width: 156px; |
padding: 0px; |
padding-left: 32px; |
border-right: 0px solid #000089; |
border-right: 2px solid #000049; |
background-color: #032865; |
color: #FFFFFF; |
height: 100%; |
z-index: 50; |
} |
.sidebar-header { |
128,7 → 133,7 |
.content { |
top: 0px; |
left: 180px; |
left: 190px; |
position: absolute; |
margin-right: 32px; |
} |
147,9 → 152,13 |
} |
.code { |
border: 1px solid #333333; |
border-top: 2px solid #999999; |
border-bottom: 2px solid #999999; |
margin: 14px; |
background-color: #DDDDDD; |
font-family: Droid Sans Mono, Monospace, Fixed; |
font-size: 9px; |
line-height: 80%; |
} |
.copyright { |
/data/favicon.png |
---|
Cannot display: file marked as a binary type. |
svn:mime-type = application/octet-stream |
/data/favicon.png |
---|
Property changes: |
Added: svn:mime-type |
## -0,0 +1 ## |
+application/octet-stream |
\ No newline at end of property |
Index: index.php |
=================================================================== |
--- index.php (revision 398) |
+++ index.php (revision 471) |
@@ -6,10 +6,9 @@ |
$page->drawHeader(); |
write('Pages'); |
$page->drawMenuItem('Biggles', '/~biggles/'); |
-$page->drawMenuItem('Freddie (FredFace)', '/~freddie/'); |
+$page->drawMenuItem('FredFace', '/~freddie/'); |
$page->drawMenuItem('Muzer', '/~muzer/'); |
-$page->drawMenuItem('Sh4rk', '/~szabot/'); |
-$page->drawMenuItem('Tom (TomMan)', '/~tom/'); |
+$page->drawMenuItem('TomMan', '/~tom/'); |
$page->drawMiddle(); |
?> |
@@ -19,11 +18,12 @@ |
|
Latest Blog Posts |
+ |
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC'); |
-for ($i = 0; $i < 5 && $i < count($ids); $i++) |
+for ($i = 0; $i < 4 && $i < count($ids); $i++) |
{ |
$id = $ids[$i]; |
$post = $page->getBlogPost($id); |
/register.php |
---|
54,6 → 54,10 |
<td><?php echo recaptcha_get_html(RECAPTCHA_PUBLICKEY); ?></td> |
</tr> |
<tr> |
<td class="bold">3 + 9 * 8</td> |
<td><input type="text" name="maths" /></td> |
</tr> |
<tr> |
<td class="bold"></td> |
<td><input type="submit" value="Register" /></td> |
</tr> |
/register-do.php |
---|
10,6 → 10,7 |
$password2 = $_POST['password2']; |
$email = $_POST['email']; |
$name = $_POST['name']; |
$maths = $_POST['maths']; |
if (empty($username)) |
{ |
27,6 → 28,10 |
{ |
$page->redirect('register.php?error=Passwords do not match'); |
} |
if ($maths != '75') |
{ |
$page->redirect('register.php?error=Incorrect maths answer'); |
} |
$resp = recaptcha_check_answer(RECAPTCHA_PRIVATEKEY, $_SERVER["REMOTE_ADDR"], |
$_POST["recaptcha_challenge_field"], |
/photos/album.php |
---|
28,8 → 28,6 |
} |
$page = new Taios_Page('Photo Albums', '../'); |
$page->drawHeader(); |
$page->drawMiddle(); |
$dirName = $_GET['dir']; |
if (empty($dirName)) |
37,6 → 35,11 |
$page->redirect('index.php'); |
} |
$page->drawHeader(); |
write('<br /><h3>RSS</h3>'); |
$page->drawMenuItem('RSS Feed', 'photos/rss.php?dir=' . $dirName); |
$page->drawMiddle(); |
write('<p class="bold"><a href="index.php">Back to Photos</a></p><br />'); |
if (file_exists("albums/" . $dirName . "/description.txt")) |
95,7 → 98,7 |
} |
$filename = $directory . $file; |
$size = getImageSizes($filename, 300, 300); |
$size = getImageSizes($filename, 280, 260); |
write('<td><a href="' . str_replace(" ", "%20", $filename) . '"><img width="' . $size[0] . '" height="' . $size[1] . '" src="' . str_replace(" ", "%20", $filename) . '" /></a></td>'); |
/photos/rss.php |
---|
0,0 → 1,76 |
<?php |
require '../_taios.php'; |
header("Content-type: application/rss+xml"); |
$page = new Taios_Page('Photos RSS Feed', '../'); |
$dirName = $_GET['dir']; |
if (empty($dirName)) |
{ |
$dirName = "Lassitor"; |
} |
write('<?xml version="1.0" encoding="UTF-8" ?>'); |
write('<rss version="2.0">'); |
write('<channel>'); |
write('<title>Tim32 Photo RSS - ' . $dirName . '</title>'); |
write('<description>This is the RSS feed for the Tim32 Photos.</description>'); |
write('<link>http://tim32.org/photos/album.php?dir=' . $dirName . '</link>'); |
$directory = "albums/" . $dirName . "/"; |
$sortOrder = "newestFirst"; |
$results = array(); |
$handler = opendir($directory); |
while ($file = readdir($handler)) |
{ |
if ($file != '.' && $file != '..' && $file != "robots.txt" && $file != ".htaccess" && getimagesize($directory . $file)) |
{ |
$currentModified = filectime($directory . $file); |
$file_names[] = $file; |
$file_dates[] = $currentModified; |
} |
} |
closedir($handler); |
if ($sortOrder == "newestFirst") |
{ |
arsort($file_dates); |
} |
else |
{ |
asort($file_dates); |
} |
$file_names_Array = array_keys($file_dates); |
foreach ($file_names_Array as $idx => $name) $name=$file_names[$name]; |
$file_dates = array_merge($file_dates); |
$indexInArray = 0; |
foreach ($file_dates as $date) |
{ |
$j = $file_names_Array[$indexInArray]; |
$file = $file_names[$j]; |
$filename = $directory . $file; |
write('<item>'); |
write('<title>' . $file . '</title>'); |
write('<link>http://tim32.org/photos/' . str_replace(" ", "%20", $filename) . '</link>'); |
write('<guid>id_' . $file . '</guid>'); |
write('<pubDate>' . date('D, d M Y H:i:s O', $date). '</pubDate>'); |
write('<description><![CDATA[<img src="http://tim32.org/photos/' . str_replace(" ", "%20", $filename) . '" />]]></description>'); |
write('</item>'); |
$indexInArray++; |
} |
write('</channel>'); |
write('</rss>'); |
?> |
/404.php |
---|
1,15 → 1,16 |
<?php |
header('Status: 404 Not Found'); |
require '_taios.php'; |
$page = new Taios_Page('404 - Pagee not found', '/'); |
$page = new Taios_Page('404 - Page not found', '/'); |
$page->drawHeader(); |
write('<h3>Pages</h3>'); |
$page->drawMenuItem('Biggles', '/~biggles/'); |
$page->drawMenuItem('Freddie', '/~freddie/'); |
$page->drawMenuItem('Muzer', '/~muzer/'); |
$page->drawMenuItem('Sh4rk', '/~szabot/'); |
$page->drawMenuItem('Tom', '/~tom/'); |
$page->drawMenuItem('Biggles', '~biggles/'); |
$page->drawMenuItem('Freddie (FredFace)', '~freddie/'); |
$page->drawMenuItem('Muzer', '~muzer/'); |
$page->drawMenuItem('Tom (TomMan)', '~tom/'); |
$page->drawMiddle(); |
?> |