WebSVN - taios - Path Comparison - / Rev 165 and / Rev 96

Ignore whitespace Rev 165 → Rev 96

/projects/index.php
File deleted

/404.php
File deleted

/wiki/index.php
File deleted

/forums/index.php
File deleted

/photos/index.php
File deleted

 /admin/all-blog-posts.php
 ,11 → 15,11
     write('<table>');
     write('<tr>');
     write('<td class="bold">ID</td>');
-    write('<td class="bold">Parent</td>');
-    write('<td class="bold">Author</td>');
+    write('<td class="bold">ParentID</td>');
+    write('<td class="bold">AuthorID</td>');
     write('<td class="bold">Title</td>');
     write('<td class="bold">Content</td>');
-    write('<td class="bold">Date Posted</td>');
+    write('<td class="bold">DatePosted</td>');
     write('<td class="bold">Category</td>');
     write('<td class="bold">Spam</td>');
     write('</tr>');
 ,21 → 27,21
     $ids = $page->findIDs('BlogPosts');
     for ($i = 0; $i < count($ids); $i++)
     {
-        $post = $page->getBlogPost($ids[$i]);
+        $poast = $page->getBlog($ids[$i]);
         write('<tr>');
-        write('<td><a href="../blog/edit-post.php?id=' . $post->ID . '">' . $post->ID . '</a></td>');
+        write('<td>' . $post->ID . '</td>');
         if ($post->parent == -1)
         {
-            write('<td style="color: #444444;">No Parent</td>');
+            write('<td>' . $post->parent . '</td>');
         }
         else
         {
-            write('<td>' . $post->parent->title . '</td>');
+            write('<td>' . $post->parent->ID . '</td>');
         }
-        write('<td><a href="account.php?id=' . $post->author->ID . '">' . $post->author->name . '</a></td>');
+        write('<td>' . $post->author->ID . '</td>');
         write('<td>' . $post->title . '</td>');
         write('<td>' . $post->content . '</td>');
-        write('<td>' . date('j/m/Y H:i', $post->datePosted) . '</td>');
+        write('<td>' . $post->datePosted . '</td>');
         write('<td>' . $post->category . '</td>');
         write('<td>' . $post->spam . '</td>');
         write('</tr>');

/admin/index.php
15,7 → 15,6
{
write('<h4><a href="all-accounts.php">Manage All Accounts</a></h4>');
write('<h4><a href="all-blog-posts.php">Manage All Blog Posts</a></h4>');
write('<h4><a href="all-projects.php">Manage All Projects</a></h4>');
write('<h4><a href="all-forum-categories.php">Manage All Forum Categories</a></h4>');
write('<h4><a href="all-forum-topics.php">Manage All Forum Topics</a></h4>');
write('<h4><a href="all-forum-posts.php">Manage All Forum Posts</a></h4>');

 /admin/all-accounts.php
 ,7 → 28,7
     {
         $user = $page->getUserByID($ids[$i]);
         write('<tr>');
-        write('<td><a href="account.php?id=' . $user->ID . '">' . $user->ID . '</a></td>');
+        write('<td>' . $user->ID . '</td>');
         write('<td>' . $user->accessID . '</td>');
         write('<td>' . $user->username . '</td>');
         write('<td>' . $user->password . '</td>');

 /_taios.php
 ,10 → 124,8
         write('<br />');
         if ($this->isUserNormal($this->getLoggedInUser()))
         {
-            echo '<p class="bold"><a href="add-post.php?id=' . $id . '">Add Comment</a>';
-            if ($this->isUserAdmin($this->getLoggedInUser()) || $this->getLoggedInUser() == $post->author->ID)
-                echo ' &middot <a href="del-post.php?id=' . $id . '">Delete Post</a>';
-            write('</p><br />');
+            write('<p class="bold"><a href="post-add.php?id=' . $id . '">Add Comment</a></p>');
+            write('<br />');
         }
         $ids = $this->findIDs('BlogPosts', 'WHERE ParentID=' . $id);
 ,47 → 157,7
             $this->drawMenuItem($cats[$i], 'blog/index.php?cat=' . $cats[$i]);
         }
     }
-    function replaceBBCode($str)
-    {
-        $newstr = str_replace("\n", '</p><p>', $str);
-        $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);
-        $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);
-        $newstr = str_replace(' :D', ' <img src="' . $this->url . 'data/smilies/face-laugh.png" class="smiley" />',$newstr);
-        $newstr = str_replace(' =D', ' <img src="' . $this->url . 'data/smilies/face-laugh.png" class="smiley" />',$newstr);
-        $newstr = str_replace(' :(', ' <img src="' . $this->url . 'data/smilies/face-sad.png" class="smiley" />',$newstr);
-        $newstr = str_replace(' :0', ' <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(' :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);
-        $bbcode = array(
-        '/\[b\](.+?)\[\/b\]/is',
-        '/\[i\](.+?)\[\/i\]/is',
-        '/\[u\](.+?)\[\/u\]/is',
-        '/\[url\](.+?)\[\/url\]/is',
-        '/\[code\](.+?)\[\/code\]/is',
-        '/\[img\](.+?)\[\/img\]/is'
-        );
-        $html = array(
-        '<b>$1</b>',
-        '<i>$1</i>',
-        '<u>$1</u>',
-        '<a href="$1">$1</a>',
-        '<div class="code">$1</div>',
-        '<img src="$1" />'
-        );
-        $newstr = preg_replace($bbcode, $html, $newstr);
-        return $newstr;
-    }
     function redirect($u)
     {
         header('Location: ' . $u);
 ,10 → 311,9
             {
                 $post->parent = $this->getBlogPost($row['ParentID']);
             }
-            $post->author = $this->getUserByID($row['AuthorID']);
-            $post->user = $this->getUserByID($row['AuthorID']); // For some older pages
+            $post->user = $this->getUserByID($row['AuthorID']);
             $post->title = $row['Title'];
-            $post->content = $this->replaceBBCode($row['Content']);
+            $post->content = $row['Content'];
             $post->datePosted = strtotime($row['DatePosted']);
             $post->category = $row['Category'];
             $post->spam = $row['Spam'];
 ,15 → 324,6
         $this->drawError('Cannot find blog post, #' . $id);
     }
-    function delBlogPost($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);
-    }
     function getGetID()
     {
         $id = $_GET['id'];

/blog/add-post.php
File deleted

/blog/del-post.php
File deleted

/blog/edit-post.php
File deleted

 /blog/post.php
 ,16 → 4,17
 $page = new Taios_Page('Blog Posts', '../');
-if (empty($_GET['id']))
-{
+if ($_GET['id'] == -1)
     $page->redirect('index.php');
-}
+if (!isset($_GET['id']))
+    $page->redirect("index.php");
 $page->drawHeader();
 $page->drawBlogCategoriesMenu();
 $page->drawMiddle();
-$page->drawBlogPostTree($page->getGetID(), true);
+$page->drawBlogPostTree($_GET['id'], true);
 $page->drawFooter();

 /blog/index.php
 ,20 → 21,17
     write('<p>Only showing blog posts from the ' . $_GET['cat'] . ' category. <a href="index.php">Reset Filtering</a></p><br />');
 }
-$query = $query . " ORDER BY DatePosted DESC";
 $ids = $page->findIDs('BlogPosts', $query);
 for ($i = 0; $i < count($ids); $i++)
 {
     $id = $ids[$i];
     $post = $page->getBlogPost($id);
-    write('<a href="post.php?id=' . $id . '"><h3>' . $post->title. '</h3></a>');
+    write('<a href="post.php?id=' . $ids[$i] . '"><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>' . $post->content . '</p>');
-    write('<br />');
 }
 $page->drawFooter();
 ?>

 /blog/post-add.php
 ,0 → 1,55
+<?php
+require '../_taios.php';
+$page = new Taios_Page('Blog Posts', '../');
+if (isset($_POST['title']) && isset($_POST['content']) && isset($_POST['catagory']) && isset($_POST['parentID']))
+{
+    $page->query('insert into BlogPosts VALUES(0, ' . $_POST['parentID'] . ', "' . $page->getLoggedInUser()->ID . '", "' . $_POST['title'] . '", "' . $_POST['content'] . '", NOW(), "' . $_POST['catagory'] . '", 0)');
+    $page->redirect('index.php');
+}
+$page->drawHeader();
+$page->drawBlogCategoriesMenu();
+$page->drawMiddle();
+if ($page->isUserGM($page->getLoggedInUser()))
+{
+    write('<p class="bold"><a href="add-post.php">Add Post</a></p>');
+    write('<br />');
+}
+?>
+<form action="post-add.php" method="post">
+<table>
+<tr>
+<td class="bold">Title: </td>
+<td><input type="text" name="title" /></td>
+</tr>
+<tr>
+<td class="bold">Content: </td>
+<td><input type="text" name="content" /></td>
+</tr>
+<tr>
+<td class="bold">Catagory: </td>
+<td><input type="text" name="catagory" /></td>
+</tr>
+<?php
+write('<input type="hidden" name="parentID" value="' . $_GET['id'] . '"/>');
+?>
+<tr>
+<td class="bold"></td>
+<td><input type="submit" value="Post" /></td>
+</tr>
+</table>
+</form>
+<?php
+$page->drawFooter();
+?>

 /styles.css
 ,15 → 72,6
     border: 1px solid #888888;
 }
-img {
-    border: 2px solid #333333;
-}
-.smiley img {
-    border: 0px;
-    vertical-align: middle;
-}
 .sidebar {
     left: 0px;
     top: 0px;
 ,10 → 122,3
     margin-left: 14px;
     border-left: 1px solid #BBBBBB;
 }
-.code {
-    border: 1px solid #333333;
-    background-color: #DDDDDD;
-    font-family: Droid Sans Mono, Monospace, Fixed;
-}

 /index.php
 ,7 → 22,7
 <?php
-$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1 ORDER BY DatePosted DESC');
+$ids = $page->findIDs('BlogPosts', 'WHERE ParentID = -1');
 for ($i = 0; $i < 5 && $i < count($ids); $i++)
 {
     $id = $ids[$i];

/data/smilies/face-surprise.png
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

/data/smilies/face-surprise.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-laugh.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-laugh.png
===================================================================
--- data/smilies/face-laugh.png (revision 165)
+++ data/smilies/face-laugh.png (nonexistent)

/data/smilies/face-laugh.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-plain.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-plain.png
===================================================================
--- data/smilies/face-plain.png (revision 165)
+++ data/smilies/face-plain.png (nonexistent)

/data/smilies/face-plain.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-sad.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-sad.png
===================================================================
--- data/smilies/face-sad.png (revision 165)
+++ data/smilies/face-sad.png (nonexistent)

/data/smilies/face-sad.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-uncertain.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-uncertain.png
===================================================================
--- data/smilies/face-uncertain.png (revision 165)
+++ data/smilies/face-uncertain.png (nonexistent)

/data/smilies/face-uncertain.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-wink.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-wink.png
===================================================================
--- data/smilies/face-wink.png (revision 165)
+++ data/smilies/face-wink.png (nonexistent)

/data/smilies/face-wink.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-raspberry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-raspberry.png
===================================================================
--- data/smilies/face-raspberry.png (revision 165)
+++ data/smilies/face-raspberry.png (nonexistent)

/data/smilies/face-raspberry.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property
Index: data/smilies/face-smile.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: data/smilies/face-smile.png
===================================================================
--- data/smilies/face-smile.png (revision 165)
+++ data/smilies/face-smile.png (nonexistent)

/data/smilies/face-smile.png
Property changes:
Deleted: svn:mime-type
## -1 +0,0 ##
-application/octet-stream
\ No newline at end of property

Subversion Repositories taios

Compare Revisions

Ignore whitespace Rev 165 → Rev 96