Subversion Repositories taios

Compare Revisions

Ignore whitespace Rev 484 → Rev 447

/404.php
7,8 → 7,10
$page = new Taios_Page('404 - Page not found', '/');
$page->drawHeader();
write('<h3>Pages</h3>');
$page->drawMenuItem('FredFace', '~freddie/');
$page->drawMenuItem('Biggles', '~biggles/');
$page->drawMenuItem('Freddie (FredFace)', '~freddie/');
$page->drawMenuItem('Muzer', '~muzer/');
$page->drawMenuItem('Tom (TomMan)', '~tom/');
$page->drawMiddle();
 
?>
24,9 → 26,6
$page->drawMenuItem('Tim32 Homepage', 'index.php');
$page->drawMenuItem('Youfail.org', 'http://youfail.org');
 
?>
<iframe src="http://notfound-static.fwebservices.be/404/index.html?&amp;key=30aca9cedc0df2682afc4e195eedb1e2" width="100%" height="650" frameborder="0"></iframe>
<?php
$page->drawFooter();
 
?>
/photos/album.php
36,8 → 36,6
}
 
$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 />');
47,6 → 45,8
write('<p>' . $page->replaceBBCode(file_get_contents("albums/" . $dirName . "/description.txt")) . '</p><br />');
}
 
write('<p><a href="rss.php?dir=' . $dirName . '">RSS Feed</a></p>');
 
write('<table>');
write('<tr>');
 
/photos/rss.php
62,7 → 62,7
write('<item>');
write('<title>' . $file . '</title>');
write('<link>http://tim32.org/photos/' . str_replace(" ", "%20", $filename) . '</link>');
write('<guid>id_' . $file . '</guid>');
write('<guid>' . $indexInArray . '</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>');
/index.php
4,15 → 4,19
 
$page = new Taios_Page('Home');
$page->drawHeader();
write('<h3>Pages</h3>');
$page->drawMenuItem('Biggles', '/~biggles/');
$page->drawMenuItem('Freddie (FredFace)', '/~freddie/');
$page->drawMenuItem('Muzer', '/~muzer/');
$page->drawMenuItem('Tom (TomMan)', '/~tom/');
write('<br /><h3>Downtime-o-meter</h3>');
write('<p>No planned down.</p>');
$page->drawMiddle();
 
?>
 
<p class="bold">Welcome to Tim32!</p>
<?php
write('<p>Tim32 is a ' . (date("Y") - 2000) . '-year-old laptop running Ubuntu Server Edition 10.04.</p>');
?>
<p>By using this website, you hereby accept cookies being stored on your computer.</p>
<p>Tim32 is a 10 year-old laptop running Ubuntu Server Edition 10.04.</p>
<br />
 
<h3 title="Take the Tim32 challenge: http://tim32.org/challenge/">Latest Blog Posts</h3>
20,19 → 24,15
 
<?php
 
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 AND Category != "Drafts" ORDER BY DatePosted DESC');
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC');
for ($i = 0; $i < 4 && $i < count($ids); $i++)
{
$id = $ids[$i];
$post = $page->getBlogPost($id);
 
$comment_count = 0;
$ids2 = $page->findIDs('BlogPosts', 'WHERE ParentID="' . $id . '"');
 
write('<a href="blog/post.php?id=' . $id . '"><h3>' . $post->title. '</h3></a>');
write('<h4><a href="blog/post.php?id=' . $post->ID . '">' . $post->title. '</a></h4>');
write('<h5 style="color: #666666;">Posted On ' . date('l j F Y', $post->datePosted) . ' by ' . $post->user->name . ' (' . $post->user->username . ')</h5>');
write('<p>' . $page->replaceBBCode($post->content) . '</p>');
write('<h5 style="color: #666666;">' . count($ids2) . ' Comments</h5>');
write('<br />');
}
 
/blog/rss.php
13,7 → 13,7
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 AND CATEGORY != "Drafts" ORDER BY DatePosted DESC');
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC');
for ($i = 0; $i < count($ids); $i++)
{
$id = $ids[$i];
/blog/index.php
23,11 → 23,6
write('<p>Only showing blog posts from the ' . $_GET['cat'] . ' category. <a href="index.php">Reset Filtering</a></p><br />');
}
 
if(!$page->isUserGM($page->getLoggedInUser()))
{
$query = $query . ' AND Category != "Drafts"';
}
 
$query = $query . " ORDER BY DatePosted DESC";
 
$ids = $page->findIDs('BlogPosts', $query);
35,13 → 30,10
{
$id = $ids[$i];
$post = $page->getBlogPost($id);
 
$ids2 = $page->findIDs('BlogPosts', 'WHERE ParentID="' . $id . '"');
write('<a href="post.php?id=' . $id . '"><h3>' . $post->title. '</h3></a>');
write('<h5 style="color: #666666;">Posted On ' . date('l j F Y', $post->datePosted) . ' by ' . $post->user->name . ' (' . $post->user->username . ')</h5>');
write('<p>' . $page->replaceBBCode($post->content) . '</p>');
write('<h5 style="color: #666666;"><a href="post.php?id=' . $id . '">' . count($ids2) . ' Comments</a></h5>');
write('<br />');
}
 
/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) || !$page->isUserNormal($page->getLoggedInUser()))
if (!$page->isUserAdmin($page->getLoggedInUser()) && $page->getLoggedInUser()->ID != $post->author->ID)
{
$page->drawError('You do not have permission to access this page.');
}
43,7 → 43,7
}
else
{
$page->query('UPDATE BlogPosts SET Content = "' . $content . '", Title = "' . $title . '", Category = "' . $category . '" WHERE ID = "' . $id . '"');
$page->query('UPDATE BlogPosts SET Content = "' . $content . '", Title = "' . $title . '", Category = "' . $category . '" WHERE ID = ' . $id);
$page->redirect('post.php?id=' . $id);
}
}
/blog/add-post.php
40,12 → 40,12
}
else
{
if (($page->getLoggedInUser()->accessID >= 2 && $parentID == -1) || $page->getLoggedInUser()->accessID > 2)
if ($page->getLoggedInUser()->accessID >= 2 && $parentID == -1)
{
$page->drawError('You do not have permission to access this page.');
}
$page->query('INSERT INTO BlogPosts VALUES(0, "' . $parentID . '", "' . $page->getLoggedInUser()->ID . '", "' . $title . '", "' . $content . '", NOW(), "' . $category . '", 0)');
$page->query('INSERT INTO BlogPosts VALUES(0, ' . $parentID . ', "' . $page->getLoggedInUser()->ID . '", "' . $title . '", "' . $content . '", NOW(), "' . $category . '", 0)');
$page->redirect('post.php?id=' . $parentID);
}
}
/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 && $page->isUserNormal($page->getLoggedInUser()))
if ($page->isUserAdmin($page->getLoggedInUser()) || $page->getLoggedInUser()->ID == $page->getBlogPost($id)->author->ID)
{
$page->delBlogPost($id);
}
/_taios.php
34,13 → 34,12
write('<head>');
write('<meta http-equiv="Content-Type" content="text/html;charset=utf-8">');
write('<title>Tim32 &middot; ' . $this->title . '</title>');
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('<link href="' . $this->url . 'styles.css" rel="stylesheet" type="text/css" media="screen">');
write('</head>');
write('<body>');
write('<div class="sidebar">');
write('<div class="sidebar-header">');
write('<a href="' . $this->url . '"><h1>Tim32</h1></a>');
write('<h1>Tim32</h1>');
write('</div>');
write('<div class="sidebar-menu">');
$this->drawMenuItem('Home', 'index.php');
50,19 → 49,11
$this->drawMenuItem('Wiki', 'wiki/');
$this->drawMenuItem('Photos', 'photos/');
write('<br />');
if ($this->isLoggedIn() && $this->isUserNormal($this->getLoggedInUser()))
if ($this->isLoggedIn())
{
$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('<span style="color:#032865">#undefined</span>', '/challenge/cakefolder');
}
else
{
$this->drawMenuItem('Login', 'login.php');
69,6 → 60,7
$this->drawMenuItem('Register', 'register.php');
}
write('<br />');
$this->drawnHeader = true;
}
}
75,14 → 67,7
function drawMenuItem($t, $u)
{
if($u == NULL)
{
write('<p style="color:red">' . $t . '</p>');
}
else
{
write('<p><a href="' . $this->url . $u . '">' . $t . '</a></p>');
}
write('<p><a href="' . $this->url . $u . '">' . $t . '</a></p>');
}
function drawMiddle()
93,7 → 78,7
write('</div>');
write('</div>');
write('<div class="content">');
write('<a href="./"><h2>' . $this->title . '</h2></a>');
write('<h2>' . $this->title . '</h2>');
 
$this->drawnMiddle = true;
}
103,7 → 88,7
{
if (!$this->drawnFooter)
{
write('<br /><p class="copyright">Tim32</p>');
write('<br /><p class="copyright">&copy; 2011 Tim32 &middot;</p>');
write('</div>');
write('</body>');
write('</html>');
153,7 → 138,7
write('</p><br />');
}
 
$ids = $this->findIDs('BlogPosts', 'WHERE ParentID="' . $id . '"');
$ids = $this->findIDs('BlogPosts', 'WHERE ParentID=' . $id);
for ($i = 0; $i < count($ids); $i++)
{
write('<div class="indent">');
170,7 → 155,7
for ($i = 0; $i < count($ids); $i++)
{
$cat = $this->getBlogPost($ids[$i])->category;
if (!in_array($cat, $cats) && ($cat != "Drafts" || $this->isUserGM($this->getLoggedInUser())))
if (!in_array($cat, $cats))
{
array_push($cats, $cat);
}
198,13 → 183,13
}*/
$newstr = $str;
$newstr = str_replace("<", "&lt;", $newstr);
$newstr = str_replace(">", "&gt;", $newstr);
$newstr = str_replace("\n", "<br />", $newstr);
$newstr = str_replace("<", "[", $newstr);
$newstr = str_replace(">", "]", $newstr);
$newstr = str_replace("\n", "</p><p>", $newstr);
$newstr = str_replace("\\'", "'", $newstr);
$newstr = str_replace("\\\"",'"', $newstr);
$newstr = str_replace(' ', '&nbsp;&nbsp;', $newstr);
/* $newstr = str_replace(' :)', ' <img src="' . $this->url . 'data/smilies/face-smile.png" class="smiley" />', $newstr);
$newstr = str_replace(' :)', ' <img src="' . $this->url . 'data/smilies/face-smile.png" class="smiley" />', $newstr);
$newstr = str_replace(' :p', ' <img src="' . $this->url . 'data/smilies/face-raspberry.png" class="smiley" />', $newstr);
$newstr = str_replace(' :P', ' <img src="' . $this->url . 'data/smilies/face-raspberry.png" class="smiley" />',$newstr);
$newstr = str_replace(' :|', ' <img src="' . $this->url . 'data/smilies/face-plain.png" class="smiley" />',$newstr);
215,7 → 200,7
$newstr = str_replace(' :o', ' <img src="' . $this->url . 'data/smilies/face-surprise.png" class="smiley" />',$newstr);
$newstr = str_replace(' :O', ' <img src="' . $this->url . 'data/smilies/face-surprise.png" class="smiley" />',$newstr);
$newstr = str_replace(' :/', ' <img src="' . $this->url . 'data/smilies/face-uncertain.png" class="smiley" />',$newstr);
$newstr = str_replace(' ;)', ' <img src="' . $this->url . 'data/smilies/face-wink.png" class="smiley" />',$newstr);*/
$newstr = str_replace(' ;)', ' <img src="' . $this->url . 'data/smilies/face-wink.png" class="smiley" />',$newstr);
$bbcode = array(
'/\[b\](.+?)\[\/b\]/is',
222,13 → 207,12
'/\[i\](.+?)\[\/i\]/is',
'/\[u\](.+?)\[\/u\]/is',
'/\[url\](.+?)\[\/url\]/is',
'/\[url="?(.+?)"?\](.+?)\[\/url\]/is',
'/\[url=(.+?)\](.+?)\[\/url\]/is',
'/\[code\](.+?)\[\/code\]/is',
'/\[img\](.+?)\[\/img\]/is',
'/\[ul\](.+?)\[\/ul\]/is',
'/\[ol\](.+?)\[\/ol\]/is',
'/\[li\](.+?)\[\/li\]/is',
'/\[mono\](.+?)\[\/mono\]/is'
'/\[li\](.+?)\[\/li\]/is'
);
 
$html = array(
237,12 → 221,11
'<u>$1</u>',
'<a href="$1">$1</a>',
'<a href="$1">$2</a>',
'</p><div class="code">$1</div><p>',
'<div class="code">$1</div>',
'<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>',
'<li>$1</li>'
);
 
$newstr = preg_replace($bbcode, $html, $newstr);
314,19 → 297,6
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;
379,7 → 349,7
function getUserByID($id)
{
$result = $this->query('SELECT * FROM Users WHERE ID = "' . $id . '"');
$result = $this->query('SELECT * FROM Users WHERE ID = ' . $id);
while ($row = mysql_fetch_array($result))
{
$user = new User;
421,7 → 391,7
function getBlogPost($id)
{
$result = $this->query('SELECT * FROM BlogPosts WHERE ID = "' . $id . '"');
$result = $this->query('SELECT * FROM BlogPosts WHERE ID = ' . $id);
while ($row = mysql_fetch_array($result))
{
$post = new BlogPost;
450,7 → 420,7
function getProject($id)
{
$result = $this->query('SELECT * FROM Projects WHERE ID = "' . $id . '"');
$result = $this->query('SELECT * FROM Projects WHERE ID = ' . $id);
while ($row = mysql_fetch_array($result))
{
$project = new Project;
473,7 → 443,7
function getForumCategory($id)
{
$result = $this->query('SELECT * FROM ForumCategories WHERE ID = "' . $id . '"');
$result = $this->query('SELECT * FROM ForumCategories WHERE ID = ' . $id);
while ($row = mysql_fetch_array($result))
{
$f = new ForumCategory;
491,7 → 461,7
function getForumPost($id)
{
$result = $this->query('SELECT * FROM ForumPosts WHERE ID = "' . $id . '"');
$result = $this->query('SELECT * FROM ForumPosts WHERE ID = ' . $id);
while ($row = mysql_fetch_array($result))
{
$f = new ForumPost;
513,13 → 483,13
function delBlogPost($id)
{
$ids = $this->findIDs('BlogPosts', 'WHERE ParentID="' . $id . '"');
$ids = $this->findIDs('BlogPosts', 'WHERE ParentID=' . $id);
for ($i = 0; $i < count($ids); $i++)
{
$this->delBlogPost($ids[$i]);
}
 
$this->query('DELETE FROM BlogPosts WHERE ID="' . $id . '"');
$this->query('DELETE FROM BlogPosts WHERE ID=' . $id);
}
 
function getGetID()
/wiki/pages/Index.txt
0,0 → 1,4
[b]Welcome to the Tim32 Wiki![/b]
 
Here you can talk about pretty much anything!
 
Property changes:
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property
Index: styles.css
===================================================================
--- styles.css (revision 484)
+++ styles.css (revision 447)
@@ -1,13 +1,12 @@
body {
- background-color: #032865;
-/* background-color: #FFFFFF;*/
+ background-color: #FFFFFF;
color: #000000;
font-family: Droid Sans, Tahoma, sans-serif;
- font-size: 10pt;
+ font-size: 10pt;
+
margin: 0px;
padding: 0px;
- height: 100%;
}
h1 {
@@ -92,17 +91,13 @@
}
.sidebar {
- top: 0px;
- left: 0px;
- position: absolute;
float: left;
width: 156px;
padding: 0px;
padding-left: 32px;
- border-right: 2px solid #000049;
+ border-right: 0px solid #000089;
+ background-color: #032865;
color: #FFFFFF;
-/* height: 100%;*/
- z-index: 50;
}
.sidebar-header {
@@ -133,17 +128,9 @@
.content {
top: 0px;
-/* left: 0px;*/
- margin-left: 190px;
-/* padding-top: 0px*/
-/* position: absolute;*/
-/* margin-right: 32px;*/
- background-color: #FFFFFF;
- height: 100%;
- height: auto !important;
- width: auto;
- display: block;
-/* display: inline-block;*/
+ left: 190px;
+ position: absolute;
+ margin-right: 32px;
}
.bold {
@@ -165,7 +152,7 @@
margin: 14px;
background-color: #DDDDDD;
font-family: Droid Sans Mono, Monospace, Fixed;
- font-size: 10pt;
+ font-size: 9px;
line-height: 80%;
}
/register.php
54,10 → 54,6
<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>
/challenge/index.php
0,0 → 1,23
<?php
 
require '../_taios.php';
 
$page = new Taios_Page('Tim32 Challenge', '../');
$page->drawHeader();
$page->drawMiddle();
 
if ($page->isLoggedIn())
{
write('<p class="bold">Take the Tim32 challenge here!</p>');
write('<p class="italic">Once you\'ve passed a challenge, your progress will automatically be saved.</p>');
write('<br /><br /><a href="00.php"><h2 style="text-align: center">Enter!</h2></a>');
}
else
{
write('<p class="bold">You need to be logged in to take the Tim32 challenge.</p>');
}
 
$page->drawFooter();
 
?>
 
/challenge/00.php
0,0 → 1,37
<?php
 
require '../_taios.php';
 
$page = new Taios_Page('Challenge - 00', '../');
$page->checkChallengeStatus(0, "index", "01");
 
$page->drawHeader();
write('<h3>Challenge</h3>');
$page->drawMenuItem('Index', 'challenge/index.php');
$page->drawMiddle();
 
?>
 
<form action="00-do.php" method="POST">
<table>
<tr>
<td class="bold">Morse: </td>
<td style="color: #FFFFFF">.. .-.. .. -.- . -- --- --- ... . </td>
</tr>
<tr>
<td class="bold">Moose: </td>
<td><input type="text" name="moose" /></td>
</tr>
<tr>
<td class="bold"></td>
<td><input type="submit" value="Submit" /></td>
</tr>
</table>
</form>
 
<?php
 
$page->drawFooter();
 
?>
 
/challenge/01.php
0,0 → 1,18
<?php
 
require '../_taios.php';
 
$page = new Taios_Page('Challenge - 01', '../');
$page->checkChallengeStatus(1, "index", "02");
 
$page->drawHeader();
write('<h3>Challenge</h3>');
$page->drawMenuItem('Index', 'challenge/index.php');
$page->drawMiddle();
 
 
 
$page->drawFooter();
 
?>
 
/challenge/00-do.php
0,0 → 1,19
<?php
 
require '../_taios.php';
 
$page = new Taios_Page('Challenge - 00', '../');
$page->checkChallengeStatus(0, "index", "01");
 
if ($_POST['moose'] == 'i like moose')
{
$page->query('UPDATE Users SET ChallengeID = 1 WHERE ID = ' . $page->getLoggedInUser()->ID);
$page->redirect('01.php');
}
else
{
$page->redirect('index.php');
}
 
?>
 
/register-do.php
10,7 → 10,6
$password2 = $_POST['password2'];
$email = $_POST['email'];
$name = $_POST['name'];
$maths = $_POST['maths'];
 
if (empty($username))
{
28,10 → 27,6
{
$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"],
/admin/index.php
9,14 → 9,7
$page->checkLoggedIn();
$user = $page->getLoggedInUser();
 
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.');
}
write('<h4><a href="account.php?id=' . $user->ID. '">Manage Account</a></h4>');
 
if ($page->isUserAdmin($user))
{
/admin/all-blog-posts.php
27,28 → 27,24
$ids = $page->findIDs('BlogPosts', 'ORDER BY DatePosted DESC');
for ($i = 0; $i < count($ids); $i++)
{
$id_str = $ids[$i];
if (!empty($id_str))
$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)
{
$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) . ' <a href="nowify.php?id=' . $post->ID . '">Nowify</a></td>');
write('<td>' . $post->category . '</td>');
write('<td>' . $post->spam . '</td>');
write('</tr>');
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>');
}
write('</table>');
/admin/account.php
11,7 → 11,7
$userID = $page->getGetID();
$user = $page->getUserByID($userID);
 
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user && $page->isUserNormal($page->getLoggedInUser()))
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user)
{
?>
 
/admin/account-do.php
13,26 → 13,26
$name = $_POST['name'];
 
$user = $page->getUserByID($userID);
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user && $page->isUserNormal($page->getLoggedInUser()))
if (($page->getLoggedInUser()->ID == $userID || $page->isUserAdmin($page->getLoggedInUser())) && $user)
{
if (isset($accessID) && $page->isUserAdmin($page->getLoggedInUser()))
{
$page->query('UPDATE Users SET AccessID = "' . $accessID . '" WHERE ID = "' . $userID . '"');
$page->query('UPDATE Users SET AccessID = "' . $accessID . '" WHERE ID = ' . $userID);
}
if (!empty($password))
{
$page->query('UPDATE Users SET Password = "' . sha1($password) . '" WHERE ID = "' . $userID . '"');
$page->query('UPDATE Users SET Password = "' . sha1($password) . '" WHERE ID = ' . $userID);
}
if (!empty($email))
{
$page->query('UPDATE Users SET EmailAddress = "' . $email . '" WHERE ID = "' . $userID . '"');
$page->query('UPDATE Users SET EmailAddress = "' . $email . '" WHERE ID = ' . $userID);
}
if (!empty($name))
{
$page->query('UPDATE Users SET Name = "' . $name . '" WHERE ID = "' . $userID . '"');
$page->query('UPDATE Users SET Name = "' . $name . '" WHERE ID = ' . $userID);
}
}
else
/forums/index.php
24,7 → 24,7
{
write('<a href="index.php?parentID=-1">Back to root</a>');
}
if ($page->isLoggedIn() && $page->isUserNormal($page->getLoggedInUser()))
if ($page->isLoggedIn())
{
if ($parentID != -1)
{
42,7 → 42,7
}
write('</p><br />');
 
$ids = $page->findIDs('ForumCategories', 'WHERE ParentID = "' . $parentID . '" ORDER BY Title ASC');
$ids = $page->findIDs('ForumCategories', 'WHERE ParentID = ' . $parentID . ' ORDER BY Title ASC');
 
if (count($ids) >= 1)
{
61,7 → 61,7
write('<br />');
}
 
$ids = $page->findIDs('ForumPosts', 'WHERE CategoryID = "' . $parentID . '" AND ParentID = -1 ORDER BY Title ASC');
$ids = $page->findIDs('ForumPosts', 'WHERE CategoryID = ' . $parentID . ' AND ParentID = -1 ORDER BY Title ASC');
 
if (count($ids) >= 1)
{
/forums/post.php
24,7 → 24,7
}
write('<br />');
 
$ids = $page->findIDs('ForumPosts', 'WHERE ParentID = "' . $id . '" ORDER BY DatePosted ASC');
$ids = $page->findIDs('ForumPosts', 'WHERE ParentID = ' . $id . ' ORDER BY DatePosted ASC');
for ($i = 0; $i < count($ids); $i++)
{
$forumPost = $page->getForumPost($ids[$i]);
/forums/delete-post-do.php
9,9 → 9,9
$id = $page->getGetID();
$post = $page->getForumPost($id);
 
if (($page->isUserAdmin($page->getLoggedInUser()) || $post->author->ID == $page->getLoggedInUser()->ID) && $post && $page->isUserNormal($page->getLoggedInUser()))
if (($page->isUserAdmin($page->getLoggedInUser()) || $post->author->ID == $page->getLoggedInUser()->ID) && $post)
{
$page->query('DELETE FROM ForumPosts WHERE ID = "' . $id . '"');
$page->query('DELETE FROM ForumPosts WHERE ID = ' . $id);
$page->redirect('index.php');
}
else
/forums/add-post-do.php
20,11 → 20,6
$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');
34,7 → 29,7
$page->redirect('add-post.php?error=No Content Specified');
}
 
$page->query('INSERT INTO ForumPosts VALUES (0, "' .$page->getLoggedInUser()->ID . '", "' . $categoryID . '", "' . $parentID . '", "' . $title . '", "' . $content . '", NOW(), FALSE)');
$page->query('INSERT INTO ForumPosts VALUES (0, ' .$page->getLoggedInUser()->ID . ', ' . $categoryID . ', ' . $parentID . ', "' . $title . '", "' . $content . '", NOW(), FALSE)');
$page->redirect('index.php?parentID=' . $categoryID);
 
?>
/forums/add-post.php
20,7 → 20,7
$categoryID = -1;
}
 
if ($page->isLoggedIn() && $page->isUserNormal($page->getLoggedInUser))
if ($page->isLoggedIn())
{
 
if (isset($_GET['error']))
/forums/edit-category-do.php
18,7 → 18,7
$page->redirect('edit-category.php?error=No Title Specified');
}
$page->query('UPDATE ForumCategories SET Title = "' . $title . '", Description = "' . $description . '" WHERE ID = "' . $id . '"');
$page->query('UPDATE ForumCategories SET Title = "' . $title . '", Description = "' . $description . '" WHERE ID = ' . $id);
$page->redirect('index.php');
}
else
/forums/delete-category-do.php
10,7 → 10,7
 
if ($page->isUserAdmin($page->getLoggedInUser()))
{
$page->query('DELETE FROM ForumCategories WHERE ID = "' . $id . '"');
$page->query('DELETE FROM ForumCategories WHERE ID = ' . $id);
$page->redirect('index.php');
}
else
/forums/add-category-do.php
22,7 → 22,7
$page->redirect('add-category.php?error=No Title Specified');
}
$page->query('INSERT INTO ForumCategories VALUES (0, "' . $parentID . '", "' . $title . '", "' . $description . '")');
$page->query('INSERT INTO ForumCategories VALUES (0, ' . $parentID . ', "' . $title . '", "' . $description . '")');
$page->redirect('index.php?parentID=' . $parentID);
}
else
/projects/edit-project-do.php
24,30 → 24,30
{
if (!empty($title))
{
$page->query('UPDATE Projects SET Title = "' . $title . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET Title = "' . $title . '" WHERE ID = ' . $project->ID);
}
if (!empty($description))
{
$page->query('UPDATE Projects SET Description = "' . $description . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET Description = "' . $description . '" WHERE ID = ' . $project->ID);
}
if (!empty($logoURL))
{
$page->query('UPDATE Projects SET LogoURL = "' . $logoURL . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET LogoURL = "' . $logoURL . '" WHERE ID = ' . $project->ID);
}
if (!empty($websiteURL))
{
$page->query('UPDATE Projects SET WebsiteURL = "' . $websiteURL . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET WebsiteURL = "' . $websiteURL . '" WHERE ID = ' . $project->ID);
}
if (!empty($downloadURL))
{
$page->query('UPDATE Projects SET DownloadURL = "' . $downloadURL . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET DownloadURL = "' . $downloadURL . '" WHERE ID = ' . $project->ID);
}
if (!empty($latestVersion))
{
$page->query('UPDATE Projects SET LatestVersion = "' . $latestVersion . '" WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET LatestVersion = "' . $latestVersion . '" WHERE ID = ' . $project->ID);
}
$page->query('UPDATE Projects SET LastUpdate = NOW() WHERE ID = "' . $project->ID . '"');
$page->query('UPDATE Projects SET LastUpdate = NOW() WHERE ID = ' . $project->ID);
 
$page->redirect('index.php');
}
/projects/delete-project-do.php
10,7 → 10,7
 
if (($page->isUserAdmin($page->getLoggedInUser()) || $page->getLoggedInUser()->ID == $project->author->ID) && $project)
{
$page->query('DELETE FROM Projects WHERE ID = "' . $id . '"');
$page->query('DELETE FROM Projects WHERE ID = ' . $id);
$page->redirect('index.php');
}
else
/projects/add-project-do.php
25,7 → 25,7
 
if ($page->isUserGM($user))
{
$page->query('INSERT INTO Projects VALUES (0, "' . $user->ID . '", "' . $title . '", "' . $description . '", "' . $logoURL . '", "' . $downloadURL . '", "' . $websiteURL . '", "' . $latestVersion . '", NOW())');
$page->query('INSERT INTO Projects VALUES (0, ' . $user->ID . ', "' . $title . '", "' . $description . '", "' . $logoURL . '", "' . $downloadURL . '", "' . $websiteURL . '", "' . $latestVersion . '", NOW())');
$page->redirect('index.php');
}
else
/data/favicon.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/data/favicon.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: login-do.php
===================================================================
--- login-do.php (revision 484)
+++ login-do.php (revision 447)
@@ -8,24 +8,19 @@
$password = $_POST['password'];
$remember = $_POST['remember'] == 'yes';
-if(strpos($_POST['oldurl'], "tim32.org") === FALSE || strpos($_POST['oldurl'], "login") !== FALSE)
- $redirurl = "http://tim32.org";
-else
- $redirurl = $_POST['oldurl'];
-
if (empty($username))
{
- $page->redirect('login.php?error=No Username Specified&oldurl=' . urlencode($redirurl));
+ $page->redirect('login.php?error=No Username Specified');
}
if (empty($password))
{
- $page->redirect('login.php?error=No Password Specified&oldurl=' . urlencode($redirurl));
+ $page->redirect('login.php?error=No Password Specified');
}
$user = $page->getUserByUsername($username);
if (!$user || $user->password != sha1($password))
{
- $page->redirect('login.php?error=Incorrect Username or Password&oldurl=' . urlencode($redirurl));
+ $page->redirect('login.php?error=Incorrect Username or Password');
}
$expires = -1;
@@ -37,6 +32,6 @@
setcookie('Tim32_Login', $user->username . '|~|' . $user->password, $expires, '/');
-$page->redirect($redirurl);
+$page->redirect('index.php');
?>
/login.php
9,7 → 9,6
?>
 
<p class="bold">Here you can login to Tim32 using your Tim32 account.</p>
<p>By using this website, you hereby accept cookies being stored on your computer.</p>
<br />
 
<?php
22,12 → 21,6
?>
 
<form action="login-do.php" method="POST">
<?php
$redirurl = $_SERVER['HTTP_REFERER'];
if($_GET['oldurl'])
$redirurl = $_GET['oldurl'];
write('<input type="hidden" name="oldurl" value="' . $redirurl . '" />');
?>
<table>
<tr>
<td class="bold">Username: </td>