WebSVN - taios - Path Comparison - / Rev 368 and / Rev 432

Ignore whitespace Rev 368 → Rev 432

 /wiki/index.php
 ,7 → 42,7
 if ($page->isUserGM($page->getLoggedInUser()))
 {
-    write('<p><a href="edit.php?page=' . $pageName . '">Edit Page</a></p><br />');
+    write('<p class="bold"><a href="edit.php?page=' . $pageName . '">Edit Page</a></p><br />');
 }
 $filename = 'pages/' . $pageName . '.txt';

 /styles.css
 ,7 → 3,7
     color: #000000;
     font-family: Droid Sans, Tahoma, sans-serif;
-    font-size: 11pt;
+    font-size: 10pt;
     margin: 0px;
     padding: 0px;
 ,7 → 46,7
 }
 p, table, span {
-    font-size: 11pt;
+    font-size: 10pt;
     margin: 8px;
     margin-left: 16px;
 }
 ,7 → 92,7
 .sidebar {
     float: left;
-    width: 146px;
+    width: 156px;
     padding: 0px;
     padding-left: 32px;
     border-right: 0px solid #000089;
 ,7 → 128,7
 .content {
     top: 0px;
-    left: 180px;
+    left: 190px;
     position: absolute;
     margin-right: 32px;
 }
 ,6 → 137,10
     font-weight: bold;
 }
+.italic {
+    font-style: italic;
+}
 .indent {
     margin-left: 14px;
     border-left: 1px solid #BBBBBB;
 ,11 → 147,25
 }
 .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 {
+    color: #BBBBBB;
+    text-align: left;
+    font-size: 9pt;
+}
+.copyright a {
+    color: #BBBBBB;
+}
 .recaptchatable .recaptcha_image_cell, #recaptcha_table {
     background-color: #4B9DE0 !important; //reCaptcha widget background color
 }

 /index.php
 ,6 → 10,8
 $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();
 ?>
 ,12 → 20,13
 <p>Tim32 is a 10 year-old laptop running Ubuntu Server Edition 10.04.</p>
 <br />
-<h3>Latest Blog Posts</h3>
+<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 < 5 && $i < count($ids); $i++)
+for ($i = 0; $i < 4 && $i < count($ids); $i++)
 {
     $id = $ids[$i];
     $post = $page->getBlogPost($id);

 /_taios.php
 ,6 → 88,7
     {
         if (!$this->drawnFooter)
         {
+            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>');
 ,6 → 173,7
         $newstr = str_replace("<", "[", $str);
         $newstr = str_replace(">", "]", $newstr);
         $newstr = str_replace("\n", '</p><p>', $newstr);
+        //$newstr = str_replace("\n", '<br />', $newstr);
         $newstr = str_replace("\\'", "'", $newstr);
         $newstr = str_replace("\\\"",'"', $newstr);
         $newstr = str_replace('  ', '&nbsp;&nbsp;', $newstr);
 ,7 → 197,10
         '/\[url\](.+?)\[\/url\]/is',
         '/\[url=(.+?)\](.+?)\[\/url\]/is',
         '/\[code\](.+?)\[\/code\]/is',
-        '/\[img\](.+?)\[\/img\]/is'
+        '/\[img\](.+?)\[\/img\]/is',
+        '/\[ul\](.+?)\[\/ul\]/is',
+        '/\[ol\](.+?)\[\/ol\]/is',
+        '/\[li\](.+?)\[\/li\]/is'
         );
         $html = array(
 ,7 → 210,10
         '<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>'
         );
         $newstr = preg_replace($bbcode, $html, $newstr);
 ,6 → 285,24
         return false;
     }
+    function checkChallengeStatus($challengeID, $previous, $next)
+    {
+        $currentChallengeID = $this->getLoggedInUser()->challengeID;
+        if (!$this->isLoggedIn())
+        {
+            $this->redirect('index.php');
+        }
+        else if ($currentChallengeID > $challengeID)
+        {
+            $this->redirect($next . '.php');
+        }
+        else if ($currentChallengeID < $challengeID)
+        {
+            $this->redirect($previous . '.php');
+        }
+    }
     function checkLoggedIn()
     {
         if (!$this->isLoggedIn())
 ,6 → 533,7
     public $author;
     public $title;
     public $description;
     public $logoURL;
     public $downloadURL;
     public $websiteURL;
 ,6 → 547,7
     public $parent;
     public $title;
     public $description;
 }
 class ForumPost

 /blog/rss.php
 ,0 → 1,32
+<?php
+require '../_taios.php';
+$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>' . str_replace(">", "&gt;", str_replace("<", "&lt;", $page->replaceBBCode($post->content))) . '</description>');
+    write('</item>');
+}
+write('</channel>');
+write('</rss>');
+?>

 /blog/index.php
 ,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()))

 /photos/album.php
 ,9 → 95,9
     }
     $filename = $directory . $file;
-    $size = getImageSizes($filename, 300, 300);
+    $size = getImageSizes($filename, 280, 260);
-    write('<td><a href="' . $filename . '"><img width="' . $size[0] . '" height="' . $size[1] . '" src="' . $filename . '" /></a></td>');
+    write('<td><a href="' . str_replace(" ", "%20", $filename) . '"><img width="' . $size[0] . '" height="' . $size[1] . '" src="' . str_replace(" ", "%20", $filename) . '" /></a></td>');
     $i++;
     $indexInArray++;
 ,7 → 104,7
 }
 write('</tr>');
-write('<table>');
+write('</table>');
 $page->drawFooter();

 /register.php
 ,11 → 42,11
 <td><input type="password" name="password2" /></td>
 </tr>
 <tr>
-<td class="bold">Email Address</td>: </td>
+<td class="bold">Email Address: </td>
 <td><input type="text" name="email" /></td>
 </tr>
 <tr>
-<td class="bold">Name</td>: </td>
+<td class="bold">Name: </td>
 <td><input type="text" name="name" /></td>
 </tr>
 <tr>
 ,6 → 58,8
 <td><input type="submit" value="Register" /></td>
 </tr>
 </table>
+<p style="text-align: center; color: #666666">By registering to Tim32, you agree to be reasonable in all your suggestion/accusations and advoid subjectivity. Suvbjective posts/comments are subject to removal by a Subject of the Tim32 Admins.</p>
 </form>
 <?php

 /challenge/index.php
 ,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 → 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 → 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 → 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');
+}
+?>

Subversion Repositories taios

Compare Revisions

Ignore whitespace Rev 368 → Rev 432