WebSVN - taios - Path Comparison - / Rev 304 and / Rev 471

Ignore whitespace Rev 304 → Rev 471

 /blog/add-post.php
 ,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
 $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
 ,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 → 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
 ,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
 ,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
 ,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
 ,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
 ,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>');

 /admin/all-accounts.php
 ,7 → 17,7
     write('<td class="bold">ID</td>');
     write('<td class="bold">AccessID</td>');
     write('<td class="bold">Username</td>');
-    write('<td class="bold">Password</td>');
+    write('<td class="bold">SHA1 Password</td>');
     write('<td class="bold">Name</td>');
     write('<td class="bold">Email Address</td>');
     write('<td class="bold">Challenge ID</td>');

 /_taios.php
 ,7 → 34,8
             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 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">');
 ,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');
 ,7 → 67,6
                 $this->drawMenuItem('Register', 'register.php');
             }
             write('<br />');
             $this->drawnHeader = true;
         }
     }
 ,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()
 ,6 → 101,7
     {
         if (!$this->drawnFooter)
         {
+            write('<br /><p class="copyright">Tim32</p>');
             write('</div>');
             write('</body>');
             write('</html>');
 ,7 → 183,24
     function replaceBBCode($str)
     {
-        $newstr = str_replace("\n", '</p><p>', $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("\\'", "'", $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(' :p', ' <img src="' . $this->url . 'data/smilies/face-raspberry.png" class="smiley" />', $newstr);
 ,8 → 220,13
         '/\[i\](.+?)\[\/i\]/is',
         '/\[u\](.+?)\[\/u\]/is',
         '/\[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(
 ,8 → 234,13
         '<i>$1</i>',
         '<u>$1</u>',
         '<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);
 ,6 → 312,37
         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;
+        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 → 552,7
     public $password;
     public $emailAddress;
     public $name;
     public $challengeID;
 }
 ,6 → 574,8
     public $author;
     public $title;
     public $description;
     public $logoURL;
     public $downloadURL;
     public $websiteURL;
 ,6 → 589,7
     public $parent;
     public $title;
     public $description;
 }
 class ForumPost

 /forums/add-post-do.php
 ,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
 ,7 → 20,7
     $categoryID = -1;
 }
-if ($page->isLoggedIn())
+if ($page->isLoggedIn() && $page->isUserNormal($page->getLoggedInUser))
 {
 if (isset($_GET['error']))

 /forums/delete-post-do.php
 ,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
 ,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 304)
+++ wiki/index.php (revision 471)
@@ -1,5 +1,12 @@

+function endswith($string, $test) {
+ $strlen = strlen($string);
+ $testlen = strlen($test);
+ if ($testlen > $strlen) return false;
+ return substr_compare($string, $test, -$testlen) === 0;
+}
+
require '../_taios.php';

$pageName = $_GET['page'];
@@ -9,12 +16,33 @@
}

$page = new Taios_Page('Wiki - ' . $pageName, '../');
+
+if (isset($_GET['random']))
+{
+ $results = array();
+ $handler = opendir('pages/');
+ while ($file = readdir($handler))
+ {
+ if ($file != '.' && $file != '..' && endswith($file, ".txt"))
+ {
+ $results[] = substr($file, 0, count($file) - 5);
+ }
+ }
+
+ $index = rand() % count($results);
+ $result = $results[$index];
+ $page->redirect('index.php?page=' . $result);
+}
+
$page->drawHeader();
+write(' Wiki ');
+$page->drawMenuItem('Index', 'wiki/index.php');
+$page->drawMenuItem('Random Page', 'wiki/index.php?random');
$page->drawMiddle();

if ($page->isUserGM($page->getLoggedInUser()))
{
- write(' Edit Page ');
+ write(' Edit Page ');
}

$filename = 'pages/' . $pageName . '.txt';

 /styles.css
 ,20 → 3,23
     color: #000000;
     font-family: Droid Sans, Tahoma, sans-serif;
-    font-size: 11pt;
+    font-size: 10pt;
+    margin: 0px;
+    padding: 0px;
 }
 h1 {
     font-size: 28pt;
-    margin: 6px;
+    margin: 8px;
     margin-top: 0px;
-    color: #000089;
-    border-bottom: 1px solid #000000;
+    color: #FFFFFF;
+    border-bottom: 1px solid #FFFFFF;
 }
 h2 {
     font-size: 20pt;
-    margin: 6px;
+    margin: 8px;
     margin-left: 8px;
     color: #00004B;
 }
 ,7 → 26,7
 h3 {
     font-size: 16pt;
-    margin: 6px;
+    margin: 8px;
     margin-left: 10px;
     color: #000055;
 }
 ,7 → 33,7
 h4 {
     font-size: 12pt;
-    margin: 6px;
+    margin: 8px;
     margin-left: 12px;
     color: #00005F;
 }
 ,14 → 40,14
 h5 {
     font-size: 10pt;
-    margin: 6px;
+    margin: 8px;
     margin-left: 14px;
     color: #000069;
 }
 p, table, span {
-    font-size: 11pt;
-    margin: 6px;
+    font-size: 10pt;
+    margin: 8px;
     margin-left: 16px;
 }
 ,21 → 91,21
 }
 .sidebar {
+    top: 0px;
     left: 0px;
-    top: 0px;
     position: fixed;
+    float: left;
+    width: 156px;
     padding: 0px;
     padding-left: 32px;
-    border-right: 1px solid #000089;
-    background-color: #FFFF73;
-    background-image: url('data/sidebar-gradient.png');
-    background-repeat: repeat-x;
-    background-position: center bottom;
+    border-right: 2px solid #000049;
+    background-color: #032865;
+    color: #FFFFFF;
+    height: 100%;
+    z-index: 50;
 }
 .sidebar-header {
-    left: 0px;
     width: 140px;
     padding: 6px;
     text-align: right;
 ,10 → 114,12
 .sidebar-menu {
     text-align: right;
     padding: 6px;
+    color: #FFFFFF;
 }
 .sidebar-menu h3 {
     margin: 6px;
+    color: #FFFFFF;
 }
 .sidebar-menu p {
 ,9 → 127,13
     margin: 4px;
 }
+.sidebar-menu a {
+    color: #FFFFFF;
+}
 .content {
-    left: 200px;
     top: 0px;
+    left: 190px;
     position: absolute;
     margin-right: 32px;
 }
 ,6 → 142,10
     font-weight: bold;
 }
+.italic {
+    font-style: italic;
+}
 .indent {
     margin-left: 14px;
     border-left: 1px solid #BBBBBB;
 ,8 → 152,35
 }
 .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
+}
+#recaptcha_table {
+    border-color: #3874A4 !important; //reCaptcha widget border color
+}
+#recaptcha_response_field {
+    border-color: #000000 !important; //Text input field border color
+    background-color:#FFFFFF !important; //Text input field background color
+}

/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 304)
+++ index.php (revision 471)
@@ -6,10 +6,9 @@
$page->drawHeader();
write(' Pages ');
$page->drawMenuItem('Biggles', '/~biggles/');
-$page->drawMenuItem('Freddie', '/~freddie/');
+$page->drawMenuItem('FredFace', '/~freddie/');
$page->drawMenuItem('Muzer', '/~muzer/');
-$page->drawMenuItem('Sh4rk', '/~szabot/');
-$page->drawMenuItem('Tom', '/~tom/');
+$page->drawMenuItem('TomMan', '/~tom/');
$page->drawMiddle();
?>
@@ -18,12 +17,13 @@
Tim32 is a 10 year-old laptop running Ubuntu Server Edition 10.04.


- Latest Blog Posts
+ Latest Blog Posts
+ Rss Feed



$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
 ,6 → 1,7
 <?php
 require '_taios.php';
+require_once '_recaptchalib.php';
 $page = new Taios_Page('Register');
 $page->drawHeader();
 ,6 → 21,12
 ?>
+<script type="text/javascript">
+var RecaptchaOptions = {
+   theme : 'clean'
+};
+</script>
 <form action="register-do.php" method="POST">
 <table>
 <tr>
 ,18 → 42,28
 <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>
 <td class="bold"></td>
+<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>
 </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

 /register-do.php
 ,6 → 1,7
 <?php
 require '_taios.php';
+require_once '_recaptchalib.php';
 $page = new Taios_Page('Login');
 ,6 → 10,7
 $password2 = $_POST['password2'];
 $email = $_POST['email'];
 $name = $_POST['name'];
+$maths = $_POST['maths'];
 if (empty($username))
 {
 ,7 → 28,20
 {
     $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"],
+                               $_POST["recaptcha_response_field"]);
+if (!$resp->is_valid)
+{
+    $page->redirect('register.php?error=Incorrect reCAPTCHA response');
+}
 $page->query('INSERT INTO Users (AccessID, Username, Password, EmailAddress, Name, ChallengeID) VALUES (2, "' . $username . '", "' . sha1($password) . '", "' . $email . '", "' . $name . '", 0)');
 $page->redirect('login.php');

 /photos/album.php
 ,8 → 28,6
 }
 $page = new Taios_Page('Photo Albums', '../');
-$page->drawHeader();
-$page->drawMiddle();
 $dirName = $_GET['dir'];
 if (empty($dirName))
 ,35 → 35,79
     $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"))
+{
+    write('<p>' . $page->replaceBBCode(file_get_contents("albums/" . $dirName . "/description.txt")) . '</p><br />');
+}
 write('<table>');
 write('<tr>');
+$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);
+$i = 0;
+$indexInArray = 0;
 $i = 0;
-$dir = dir('albums/' . $dirName);
-while (($file = $dir->read()) !== false)
+foreach ($file_dates as $$file_dates)
 {
-    if ($file[0] != '.')
+    $j = $file_names_Array[$indexInArray];
+    $file = $file_names[$j];
+    if ($i >= 3)
     {
-        if ($i >= 4)
-        {
-            write('</tr><tr>');
-            $i = 0;
-        }
+        write('</tr><tr>');
+        $i = 0;
+    }
-        $filename = 'albums/' . $dirName . '/' . $file;
-        $size = getImageSizes($filename, 200, 200);
-        write('<td><a href="' . $filename . '"><img width="' . $size[0] . '" height="' . $size[1] . '" src="' . $filename . '" /></a></td>');
+    $filename = $directory . $file;
+    $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>');
-        $i++;
-    }
+    $i++;
+    $indexInArray++;
 }
 write('</tr>');
-write('<table>');
+write('</table>');
 $page->drawFooter();

 /photos/rss.php
 ,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>');
+?>

 /photos/index.php
 ,9 → 8,17
 write('<p>Here we have all sorts of photos from Tim32.</p><br />');
+$dirs = array();
 $dir = dir('albums/');
 while (($file = $dir->read()) !== false)
 {
+    array_push($dirs, $file);
+}
+asort($dirs);
+foreach ($dirs as $file)
+{
     if ($file[0] != '.')
     {
         write('<p><a href="album.php?dir=' . $file . '">' . $file . '</a></p>');

 /404.php
 ,15 → 1,16
 <?php
+header('Status: 404 Not Found');
 require '_taios.php';
-$page = new Taios_Page('404');
+$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();
 ?>
 ,6 → 17,7
 <p class="bold">404 - Page not found</p>
 <p>The page you requested could not be found.</p>
+<br />
 <h4>Useful Links</h4>
 ,6 → 24,7
 <?php
 $page->drawMenuItem('Tim32 Homepage', 'index.php');
+$page->drawMenuItem('Youfail.org', 'http://youfail.org');
 $page->drawFooter();

 /_recaptchalib.php
 ,0 → 1,277
+<?php
+/*
+ * This is a PHP library that handles calling reCAPTCHA.
+ *    - Documentation and latest version
+ *          http://recaptcha.net/plugins/php/
+ *    - Get a reCAPTCHA API Key
+ *          https://www.google.com/recaptcha/admin/create
+ *    - Discussion group
+ *          http://groups.google.com/group/recaptcha
+ *
+ * Copyright (c) 2007 reCAPTCHA -- http://recaptcha.net
+ * AUTHORS:
+ *   Mike Crawford
+ *   Ben Maurer
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+/**
+ * The reCAPTCHA server URL's
+ */
+define("RECAPTCHA_API_SERVER", "http://www.google.com/recaptcha/api");
+define("RECAPTCHA_API_SECURE_SERVER", "https://www.google.com/recaptcha/api");
+define("RECAPTCHA_VERIFY_SERVER", "www.google.com");
+/**
+ * Encodes the given data into a query string format
+ * @param $data - array of string elements to be encoded
+ * @return string - encoded request
+ */
+function _recaptcha_qsencode ($data) {
+        $req = "";
+        foreach ( $data as $key => $value )
+                $req .= $key . '=' . urlencode( stripslashes($value) ) . '&';
+        // Cut the last '&'
+        $req=substr($req,0,strlen($req)-1);
+        return $req;
+}
+/**
+ * Submits an HTTP POST to a reCAPTCHA server
+ * @param string $host
+ * @param string $path
+ * @param array $data
+ * @param int port
+ * @return array response
+ */
+function _recaptcha_http_post($host, $path, $data, $port = 80) {
+        $req = _recaptcha_qsencode ($data);
+        $http_request  = "POST $path HTTP/1.0\r\n";
+        $http_request .= "Host: $host\r\n";
+        $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n";
+        $http_request .= "Content-Length: " . strlen($req) . "\r\n";
+        $http_request .= "User-Agent: reCAPTCHA/PHP\r\n";
+        $http_request .= "\r\n";
+        $http_request .= $req;
+        $response = '';
+        if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) {
+                die ('Could not open socket');
+        }
+        fwrite($fs, $http_request);
+        while ( !feof($fs) )
+                $response .= fgets($fs, 1160); // One TCP-IP packet
+        fclose($fs);
+        $response = explode("\r\n\r\n", $response, 2);
+        return $response;
+}
+/**
+ * Gets the challenge HTML (javascript and non-javascript version).
+ * This is called from the browser, and the resulting reCAPTCHA HTML widget
+ * is embedded within the HTML form it was called from.
+ * @param string $pubkey A public key for reCAPTCHA
+ * @param string $error The error given by reCAPTCHA (optional, default is null)
+ * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false)
+ * @return string - The HTML to be embedded in the user's form.
+ */
+function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false)
+{
+        if ($pubkey == null || $pubkey == '') {
+                die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+        }
+        if ($use_ssl) {
+                $server = RECAPTCHA_API_SECURE_SERVER;
+        } else {
+                $server = RECAPTCHA_API_SERVER;
+        }
+        $errorpart = "";
+        if ($error) {
+           $errorpart = "&amp;error=" . $error;
+        }
+        return '<script type="text/javascript" src="'. $server . '/challenge?k=' . $pubkey . $errorpart . '"></script>
+        <noscript>
+                <iframe src="'. $server . '/noscript?k=' . $pubkey . $errorpart . '" height="300" width="500" frameborder="0"></iframe><br/>
+                <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
+                <input type="hidden" name="recaptcha_response_field" value="manual_challenge"/>
+        </noscript>';
+}
+/**
+ * A ReCaptchaResponse is returned from recaptcha_check_answer()
+ */
+class ReCaptchaResponse {
+        var $is_valid;
+        var $error;
+}
+/**
+  * Calls an HTTP POST function to verify if the user's guess was correct
+  * @param string $privkey
+  * @param string $remoteip
+  * @param string $challenge
+  * @param string $response
+  * @param array $extra_params an array of extra variables to post to the server
+  * @return ReCaptchaResponse
+  */
+function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array())
+{
+        if ($privkey == null || $privkey == '') {
+                die ("To use reCAPTCHA you must get an API key from <a href='https://www.google.com/recaptcha/admin/create'>https://www.google.com/recaptcha/admin/create</a>");
+        }
+        if ($remoteip == null || $remoteip == '') {
+                die ("For security reasons, you must pass the remote ip to reCAPTCHA");
+        }
+        //discard spam submissions
+        if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) {
+                $recaptcha_response = new ReCaptchaResponse();
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = 'incorrect-captcha-sol';
+                return $recaptcha_response;
+        }
+        $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify",
+                                          array (
+                                                 'privatekey' => $privkey,
+                                                 'remoteip' => $remoteip,
+                                                 'challenge' => $challenge,
+                                                 'response' => $response
+                                                 ) + $extra_params
+                                          );
+        $answers = explode ("\n", $response [1]);
+        $recaptcha_response = new ReCaptchaResponse();
+        if (trim ($answers [0]) == 'true') {
+                $recaptcha_response->is_valid = true;
+        }
+        else {
+                $recaptcha_response->is_valid = false;
+                $recaptcha_response->error = $answers [1];
+        }
+        return $recaptcha_response;
+}
+/**
+ * gets a URL where the user can sign up for reCAPTCHA. If your application
+ * has a configuration page where you enter a key, you should provide a link
+ * using this function.
+ * @param string $domain The domain where the page is hosted
+ * @param string $appname The name of your application
+ */
+function recaptcha_get_signup_url ($domain = null, $appname = null) {
+        return "https://www.google.com/recaptcha/admin/create?" .  _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname));
+}
+function _recaptcha_aes_pad($val) {
+        $block_size = 16;
+        $numpad = $block_size - (strlen ($val) % $block_size);
+        return str_pad($val, strlen ($val) + $numpad, chr($numpad));
+}
+/* Mailhide related code */
+function _recaptcha_aes_encrypt($val,$ky) {
+        if (! function_exists ("mcrypt_encrypt")) {
+                die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed.");
+        }
+        $mode=MCRYPT_MODE_CBC;
+        $enc=MCRYPT_RIJNDAEL_128;
+        $val=_recaptcha_aes_pad($val);
+        return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0");
+}
+function _recaptcha_mailhide_urlbase64 ($x) {
+        return strtr(base64_encode ($x), '+/', '-_');
+}
+/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */
+function recaptcha_mailhide_url($pubkey, $privkey, $email) {
+        if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) {
+                die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " .
+                     "you can do so at <a href='http://www.google.com/recaptcha/mailhide/apikey'>http://www.google.com/recaptcha/mailhide/apikey</a>");
+        }
+        $ky = pack('H*', $privkey);
+        $cryptmail = _recaptcha_aes_encrypt ($email, $ky);
+        return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail);
+}
+/**
+ * gets the parts of the email to expose to the user.
+ * eg, given johndoe@example,com return ["john", "example.com"].
+ * the email is then displayed as john...@example.com
+ */
+function _recaptcha_mailhide_email_parts ($email) {
+        $arr = preg_split("/@/", $email );
+        if (strlen ($arr[0]) <= 4) {
+                $arr[0] = substr ($arr[0], 0, 1);
+        } else if (strlen ($arr[0]) <= 6) {
+                $arr[0] = substr ($arr[0], 0, 3);
+        } else {
+                $arr[0] = substr ($arr[0], 0, 4);
+        }
+        return $arr;
+}
+/**
+ * Gets html to display an email address given a public an private key.
+ * to get a key, go to:
+ *
+ * http://www.google.com/recaptcha/mailhide/apikey
+ */
+function recaptcha_mailhide_html($pubkey, $privkey, $email) {
+        $emailparts = _recaptcha_mailhide_email_parts ($email);
+        $url = recaptcha_mailhide_url ($pubkey, $privkey, $email);
+        return htmlentities($emailparts[0]) . "<a href='" . htmlentities ($url) .
+                "' onclick=\"window.open('" . htmlentities ($url) . "', '', 'toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width=500,height=300'); return false;\" title=\"Reveal this e-mail address\">...</a>@" . htmlentities ($emailparts [1]);
+}
+?>

Subversion Repositories taios

Compare Revisions

Ignore whitespace Rev 304 → Rev 471

Wiki

Pages

Latest Blog Posts

Latest Blog Posts