Subversion Repositories taios

Compare Revisions

Ignore whitespace Rev 449 → Rev 398

/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>
/styles.css
3,7 → 3,7
color: #000000;
font-family: Droid Sans, Tahoma, sans-serif;
font-size: 10pt;
font-size: 11pt;
margin: 0px;
padding: 0px;
46,7 → 46,7
}
 
p, table, span {
font-size: 10pt;
font-size: 11pt;
margin: 8px;
margin-left: 16px;
}
92,7 → 92,7
 
.sidebar {
float: left;
width: 156px;
width: 146px;
padding: 0px;
padding-left: 32px;
border-right: 0px solid #000089;
128,7 → 128,7
 
.content {
top: 0px;
left: 190px;
left: 180px;
position: absolute;
margin-right: 32px;
}
147,13 → 147,9
}
 
.code {
border-top: 2px solid #999999;
border-bottom: 2px solid #999999;
margin: 14px;
border: 1px solid #333333;
background-color: #DDDDDD;
font-family: Droid Sans Mono, Monospace, Fixed;
font-size: 9px;
line-height: 80%;
}
 
.copyright {
/index.php
8,9 → 8,8
$page->drawMenuItem('Biggles', '/~biggles/');
$page->drawMenuItem('Freddie (FredFace)', '/~freddie/');
$page->drawMenuItem('Muzer', '/~muzer/');
$page->drawMenuItem('Sh4rk', '/~szabot/');
$page->drawMenuItem('Tom (TomMan)', '/~tom/');
write('<br /><h3>Downtime-o-meter</h3>');
write('<p>No planned down.</p>');
$page->drawMiddle();
 
?>
20,12 → 19,11
<br />
 
<h3 title="Take the Tim32 challenge: http://tim32.org/challenge/">Latest Blog Posts</h3>
<p><a href="blog/rss.php">Rss Feed</a></p>
 
<?php
 
$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC');
for ($i = 0; $i < 4 && $i < count($ids); $i++)
for ($i = 0; $i < 5 && $i < count($ids); $i++)
{
$id = $ids[$i];
$post = $page->getBlogPost($id);
/_taios.php
88,7 → 88,7
{
if (!$this->drawnFooter)
{
write('<br /><p class="copyright">&copy; 2011 Tim32 &middot;</p>');
write('<br /><p class="copyright">&copy; 2011 Tim32 &middot; <a href="http://validator.w3.org/check?uri=http%3A%2F%2Ftim32.org%2F">HTML5 Valid</a></p>');
write('</div>');
write('</body>');
write('</html>');
170,22 → 170,9
function replaceBBCode($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("<", "[", $str);
$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(' ', '&nbsp;&nbsp;', $newstr);
209,10 → 196,7
'/\[url\](.+?)\[\/url\]/is',
'/\[url=(.+?)\](.+?)\[\/url\]/is',
'/\[code\](.+?)\[\/code\]/is',
'/\[img\](.+?)\[\/img\]/is',
'/\[ul\](.+?)\[\/ul\]/is',
'/\[ol\](.+?)\[\/ol\]/is',
'/\[li\](.+?)\[\/li\]/is'
'/\[img\](.+?)\[\/img\]/is'
);
 
$html = array(
222,10 → 206,7
'<a href="$1">$1</a>',
'<a href="$1">$2</a>',
'<div class="code">$1</div>',
'<img src="$1" />',
'<ul>$1</ul>',
'<ol>$1</ol>',
'<li>$1</li>'
'<img src="$1" />'
);
 
$newstr = preg_replace($bbcode, $html, $newstr);
524,7 → 505,6
public $password;
public $emailAddress;
public $name;
 
public $challengeID;
}
 
546,8 → 526,6
public $author;
public $title;
public $description;
 
 
public $logoURL;
public $downloadURL;
public $websiteURL;
561,7 → 539,6
public $parent;
public $title;
public $description;
 
}
 
class ForumPost
/photos/rss.php
File deleted
/photos/album.php
28,6 → 28,8
}
 
$page = new Taios_Page('Photo Albums', '../');
$page->drawHeader();
$page->drawMiddle();
 
$dirName = $_GET['dir'];
if (empty($dirName))
35,11 → 37,6
$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"))
98,7 → 95,7
}
$filename = $directory . $file;
$size = getImageSizes($filename, 280, 260);
$size = getImageSizes($filename, 300, 300);
 
write('<td><a href="' . str_replace(" ", "%20", $filename) . '"><img width="' . $size[0] . '" height="' . $size[1] . '" src="' . str_replace(" ", "%20", $filename) . '" /></a></td>');
/wiki/index.php
42,7 → 42,7
 
if ($page->isUserGM($page->getLoggedInUser()))
{
write('<p class="bold"><a href="edit.php?page=' . $pageName . '">Edit Page</a></p><br />');
write('<p><a href="edit.php?page=' . $pageName . '">Edit Page</a></p><br />');
}
 
$filename = 'pages/' . $pageName . '.txt';
/404.php
1,16 → 1,15
<?php
 
header('Status: 404 Not Found');
 
require '_taios.php';
 
$page = new Taios_Page('404 - Page not found', '/');
$page = new Taios_Page('404 - Pagee not found', '/');
$page->drawHeader();
write('<h3>Pages</h3>');
$page->drawMenuItem('Biggles', '~biggles/');
$page->drawMenuItem('Freddie (FredFace)', '~freddie/');
$page->drawMenuItem('Muzer', '~muzer/');
$page->drawMenuItem('Tom (TomMan)', '~tom/');
$page->drawMenuItem('Biggles', '/~biggles/');
$page->drawMenuItem('Freddie', '/~freddie/');
$page->drawMenuItem('Muzer', '/~muzer/');
$page->drawMenuItem('Sh4rk', '/~szabot/');
$page->drawMenuItem('Tom', '/~tom/');
$page->drawMiddle();
 
?>
/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"],
/blog/rss.php
File deleted
/blog/index.php
5,8 → 5,6
$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()))