Rewrote Pillowcase

NOTE: There is a new database schema now, so the database from the testing server has to be copied over to the production server, otherwise this code
will fail.

25 files changed, 210 insertions, 357 deletions

@@ -1,2 +1 @@
-images/
-moderation/
+images/.*\.png
@@ -1,10 +1,11 @@
 RewriteEngine On
-RewriteRule comic([0-9]+).htm /index.php?id=$1 [QSA,L]
-RewriteRule scripts/ / [R]
+RewriteRule comic([0-9]+).htm /index.php?area=comic&id=$1 [QSA,L]
+RewriteRule pages/ / [R]
+RewriteRule includes/ / [R]
 RewriteRule config.php / [R]
 RewriteRule header.php / [R]
 RewriteRule footer.php / [R]
 RewriteCond %{REQUEST_FILENAME} !.png
 RewriteRule images/ / [R]
 RewriteCond %{REQUEST_FILENAME} .htm
-RewriteRule (.+).htm $1.php [QSA]
+RewriteRule (.+).htm /index.php?area=$1 [QSA,L]
@@ -1,4 +0,0 @@
-RewriteEngine On
-RewriteCond %{REQUEST_FILENAME} !index.php
-RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule (.*).php /admin/index.php?file=$1 [QSA,L]
@@ -1,30 +0,0 @@
-<?php
-
-$getimage = "SELECT * FROM moderation WHERE id = " . $_GET['id'];
-$getimage2 = mysql_query($getimage);
-$getimage3 = mysql_fetch_array($getimage2);
-
-$title = $getimage3['title'];
-$title = preg_replace('/[^A-Za-z0-9 ]/','',$title);
-$title = str_replace(' ', '-', $title);
-$title = preg_replace('/-{2,}/','-',$title);
-if (substr($title,0,1) == '-')
-{
-        $title = substr($title,1);
-}
-if (substr($title,strlen($title)-1,1) == '-')
-{
-        $title = substr($title,0,strlen($title)-1);
-}
-$title = strtolower($title);
-rename($_SERVER['DOCUMENT_ROOT'] . '/moderation/' . $getimage3['id'] . '.png', $_SERVER['DOCUMENT_ROOT'] . '/images/' . $title . '.png');
-
-$insimage = "INSERT INTO pending (title,filename,text,author) VALUES (\"" . $getimage3['title'] . "\",\"" . $title . "\",\"" . $getimage3['text'] . "\",\"" . $getimage3['author'] . "\")";
-$insimage2 = mysql_query($insimage);
-
-$delimage = "DELETE FROM moderation WHERE id = " . $_GET['id'];
-$delimage2 = mysql_query($delimage);
-
-?>
-
-Added comic <?php echo($getimage3['title']); ?>!
@@ -1,27 +0,0 @@
-<?php
-
-session_start();
-
-ob_start();
-
-include('../header.php');
-
-if (!isset($_SESSION['username']))
-{
-        include('login.php');
-} else {
-        if (!isset($_GET['file']))
-        {
-                $file = 'main.php';
-        } else {
-                $file = basename($_GET['file'] . '.php');
-        }
-
-        include($file);
-}
-
-include('../footer.php');
-
-ob_end_flush();
-
-?>
@@ -1,30 +0,0 @@
-<?php
-
-if (!isset($_GET['submit']))
-{
-
-?>
-<FORM ACTION="/admin/login.php?submit=" METHOD="POST">
-Username: <INPUT TYPE="text" NAME="user"><BR>
-Password: <INPUT TYPE="password" NAME="pass"><BR>
-<INPUT TYPE="submit"></FORM>
-<?php
-
-} else {
-        $getconfig = "SELECT * FROM config WHERE name = \"username\" OR name = \"password\" ORDER BY name DESC";
-        $getconfig2 = mysql_query($getconfig) or die($getconfig);
-        $username = mysql_fetch_array($getconfig2);
-        $password = mysql_fetch_array($getconfig2);
-
-        if (($username['value'] == $_POST['user']) && ($password['value'] == md5($_POST['pass'])))
-        {
-                $_SESSION['username'] = $_POST['user'];
-
-                header('Location: /admin/');
-                exit;
-        } else {
-?><H2>Incorrect login</H2><?php
-        }
-}
-
-?>
@@ -1,7 +0,0 @@
-<?php
-
-unset($_SESSION['username']);
-
-header('Location: /');
-
-?>
@@ -1,8 +0,0 @@
-<H2>Admin Panel</H2>
-
-<UL>
-        <LI><A HREF="/admin/post.php">Upload a comic</A></LI>
-        <LI><A HREF="/admin/manage.php">Manage moderation queue</A></LI>
-        <LI><A HREF="/admin/update.php">HG Update</A></LI>
-        <LI><A HREF="/admin/logout.php">Logout</A></LI>
-</UL>
@@ -1,15 +0,0 @@
-<UL><?php
-
-$getimages = "SELECT * FROM moderation";
-$getimages2 = mysql_query($getimages);
-while ($getimages3 = mysql_fetch_array($getimages2))
-{
-?><LI><?php echo($getimages3['title']); ?> -
-<IMG SRC="/moderation/<?php echo($getimages3['id']); ?>.png" ALT="<?php echo($getimages3['text']); ?>" TITLE="<?php echo($getimages3['text']); ?>"> - 
-<A HREF="/admin/add.php?id=<?php echo($getimages3['id']); ?>">Add to Pending Queue</A> -
-<A HREF="/admin/remove.php?id=<?php echo($getimages3['id']); ?>">Remove</A></LI><?php
-}
-
-?></UL>
-
-<A HREF="/admin/">Back to Admin</A>
@@ -1,10 +0,0 @@
-<?php
-
-$delimage = "DELETE FROM moderation WHERE id = " . $_GET['id'];
-$delimage2 = mysql_query($delimage);
-
-unlink($_SERVER['DOCUMENT_ROOT'] . '/moderation/' . $_GET['id'] . '.png');
-
-?>
-
-Removed comic <?php echo($_GET['id']); ?>!
@@ -1,5 +0,0 @@
-<?php
-
-system('hg update');
-
-?>
@@ -1,23 +0,0 @@
-<?php
-
-include('header.php');
-
-?>                      <H1>Archive</H1>
-
-                        <UL ID="archive">
-<?php
-
-$getimages = "SELECT * FROM images ORDER BY id ASC";
-$getimages2 = mysql_query($getimages);
-while ($getimages3 = mysql_fetch_array($getimages2))
-{
-?>                              <LI><A HREF="/comic<?php echo($getimages3['id']); ?>.htm"><?php echo($getimages3['title']); ?></A></LI>
-<?php
-}
-
-?>                      </UL>
-<?php
-
-include('footer.php');
-
-?>
@@ -0,0 +1,35 @@
+<?php
+
+function has_meta($id, $name)
+{
+        $getmeta = "SELECT * FROM meta WHERE comic_id = " . $id . " AND name = \"" . $name . "\"";
+        $getmeta2 = mysql_query($getmeta);
+        $getmeta3 = mysql_fetch_array($getmeta2);
+
+        if ($getmeta3['name'] == $name)
+        {
+                return true;
+        }
+
+        return false;
+}
+
+function get_meta($id, $name)
+{
+        $getmeta = "SELECT * FROM meta WHERE comic_id = " . $id . " AND name = \"" . $name . "\"";
+        $getmeta2 = mysql_query($getmeta);
+        $getmeta3 = mysql_fetch_array($getmeta2);
+
+        return $getmeta3['value'];      
+}
+
+function next_comic_id()
+{
+        $getcomic = "SELECT * FROM comics WHERE status = \"publish\" ORDER BY comic_id DESC LIMIT 0,1";
+        $getcomic2 = mysql_query($getcomic);
+        $getcomic3 = mysql_fetch_array($getcomic2);
+
+        return ($getcomic3['comic_id']+1);
+}
+
+?>
@@ -22,6 +22,7 @@ if (isset($title))
 <?php
 
 include_once($_SERVER['DOCUMENT_ROOT'] . '/db.php');
+include_once($_SERVER['DOCUMENT_ROOT'] . '/functions.php');
 
 $getlast = "SELECT * FROM config WHERE name = \"lastUpdated\"";
 $getlast2 = mysql_query($getlast);
@@ -30,16 +31,18 @@ $getlast3 = mysql_fetch_array($getlast2);
 $last = $getlast3['value'];
 if ($last != date('md'))
 {
-        $getpending = "SELECT * FROM pending ORDER BY id ASC LIMIT 0,1";
+        $getpending = "SELECT * FROM comics WHERE status = \"pending\" ORDER BY id ASC LIMIT 0,1";
         $getpending2 = mysql_query($getpending);
         $getpending3 = mysql_fetch_array($getpending2);
         if (!empty($getpending3))
         {
-                $inscomic = "INSERT INTO images (title,filename, text) VALUES (\"" . mysql_real_escape_string($getpending3['title']) . "\",\"" . mysql_real_escape_string($getpending3['filename']) . "\",\"" . mysql_real_escape_string($getpending3['text']) . "\")";
-                $inscomic2 = mysql_query($inscomic) or die($inscomic);
+                $id = next_comic_id();
 
-                $delcomic = "DELETE FROM pending WHERE id = " . $getpending3['id'];
-                $delcomic2 = mysql_query($delcomic) or die($delcomic);
+                $setcomic = "UPDATE comics SET status = \"publish\", comic_id = " . $id . " WHERE id = " . $getpending3['id'];
+                $setcomic2 = mysql_query($setcomic) or die($setcomic);
+
+                $insmeta = "INSERT INTO meta (comic_id,name,value) VALUES (" . $getpending3['id'] . ",\"pubDate\",\"" . date('Y-m-d H:i:s') . "\")";
+                $insmeta2 = mysql_query($insmeta) or die($insmeta);
 
                 $setconfig = "UPDATE config SET value = \"" . date('md') . "\" WHERE name = \"lastUpdated\"";
                 $setconfig2 = mysql_query($setconfig);
@@ -1,123 +1,24 @@
 <?php
 
-include('db.php');
+include('includes/db.php');
+include('includes/functions.php');
 
 ob_start();
 
-if (isset($_GET['id']))
+$filename = 'pages/' . basename($_GET['area']) . '.php';
+if (!file_exists($filename))
 {
-        $getimage = "SELECT * FROM images WHERE id = " . $_GET['id'];
-} else {
-        $getimage = "SELECT * FROM images ORDER BY id DESC LIMIT 0,1";
+        $filename = 'pages/comic.php';
 }
-$getimage2 = mysql_query($getimage);
-$getimage3 = mysql_fetch_array($getimage2);
 
-?>
-                        <DIV CLASS="post">
-                                <DIV CLASS="date" TITLE="<?php echo(date('F jS Y g:i a', strtotime($getimage3['pubDate']))); ?>">
-                                        <?php echo(date('M',strtotime($getimage3['pubDate']))); ?><BR>
-                                        <?php echo(date('j',strtotime($getimage3['pubDate']))); ?><BR>
-                                        <?php echo(date('Y',strtotime($getimage3['pubDate']))); ?>
-
-                                </DIV>
-
-                                <DIV CLASS="title">
-                                        <H2><?php echo($getimage3['title']); ?></H2>
-<?php
-
-if ($getimage3['author'] != '')
-{
-?>
-                                        <CENTER><SMALL>Guest comic by <?php echo($getimage3['author']); ?></SMALL></CENTER>
-<?php
-}
-
-?>
-                                </DIV>
-                        </DIV>
-
-                        <DIV CLASS="image">
-                                <IMG SRC="/images/<?php echo($getimage3['filename']); ?>" ALT="<?php echo(htmlentities($getimage3['text'])); ?>" TITLE="<?php echo(htmlentities($getimage3['text'])); ?>">
-                        </DIV>
-
-                        <DIV CLASS="cleardiv"></DIV>
-
-                        <UL CLASS="navbar">
-<?php
-
-$id = $getimage3['id'];
-
-$cntimages = "SELECT COUNT(*) FROM images";
-$cntimages2 = mysql_query($cntimages);
-$cntimages3 = mysql_fetch_array($cntimages2);
-$all = $cntimages3['COUNT(*)'];
-
-if ($id > 2)
-{
-?>                              <LI><A HREF="/comic1.htm">First</a></LI>
-<?php
-}
-
-if ($id > 1)
-{
-?>                              <LI><A HREF="/comic<?php echo($id-1); ?>.htm">Back</A></LI>
-<?php
-}
-
-if ($id < $all)
-{
-        if ($id != ($all-1))
-        {
-?>                              <LI><A HREF="/comic<?php echo($id+1); ?>.htm">Next</A></LI>
-<?php
-?>                              <LI><A HREF="/">Today</A></LI>
-<?php
-        } else {
-?>                              <LI><A HREF="/">Next</A></LI>
-<?php
-        }
-}
-
-$cntpending = "SELECT COUNT(*) FROM pending";
-$cntpending2 = mysql_query($cntpending);
-$cntpending3 = mysql_fetch_array($cntpending2);
-$numpending = $cntpending3['COUNT(*)'];
-
-?>
-                        </UL>
-
-                        <DIV CLASS="cleardiv"></DIV>
+include($filename);
 
-                        <P>
-                                pillowcase - the result of an obsession with cute, plush objects that talk nonsense
-                        </P>
+$doc = ob_get_contents();
 
-                        <P>
-                                because we luv <A HREF="http://xkcd.com">xkcd</A>, make sure you look for the alt text
-                        </P>
-
-                        <P>
-<?php if ($numpending == 1): ?>
-                                there is 1 comic in the pending queue, which means that if Starla wants to be lazy and can't be bothered to update, she can relax for 1 more day before she starts getting angry emails
-<?php elseif ($numpending == 0): ?>
-                                oh dear, there aren't any comics in the pending queue, which means that if Starla doesn't hurry up, there may not be a comic tomorrow
-<?php elseif ($numpending > 100): ?>
-                                OMG! There are <?php echo($numpending); ?> comics in the pending queue! Starla, you relax as long as you want!
-<?php else: ?>
-                                there are <?php echo($numpending); ?> comics in the pending queue, which means that if Starla wants to be lazy and can't be bothered to update, she can relax for <?php echo($numpending); ?> days before she starts getting angry emails
-<?php endif; ?>
-                        </P>
-<?php
-
-$contents = ob_get_contents();
 ob_end_clean();
 
-$title = $getimage3['title'];
-include('header.php');
-
-echo($contents);
-
-include('footer.php');
+include('includes/header.php');
+echo($doc);
+include('includes/footer.php');
 
 ?>
@@ -1,8 +1,3 @@
-<?php
-
-include('header.php');
-
-?>
                         <H1>About</H1>
 
                         <P>
@@ -24,8 +19,3 @@ include('header.php');
                                 story and providing the first 11 Pillowcase comics with it, Starla went a little Pillowcase-insane and turned it
                                 into a real webcomic.
                         </P>
-<?php
-
-include('footer.php');
-
-?>
@@ -0,0 +1,14 @@
+                        <H1>Archive</H1>
+
+                        <UL ID="archive">
+<?php
+
+$getcomics = "SELECT * FROM comics WHERE status = \"publish\" ORDER BY comic_id ASC";
+$getcomics2 = mysql_query($getcomics);
+while ($getcomics3 = mysql_fetch_array($getcomics2))
+{
+?>                              <LI><A HREF="/comic<?php echo($getcomics3['comic_id']); ?>.htm"><?php echo($getcomics3['title']); ?></A></LI>
+<?php
+}
+
+?>                      </UL>
@@ -0,0 +1,131 @@
+<?php
+
+if (isset($_GET['id']))
+{
+        $getcomic = "SELECT * FROM comics WHERE comic_id = " . $_GET['id'] . " AND status = \"publish\"";
+} else {
+        $getcomic = "SELECT * FROM comics WHERE status = \"publish\" ORDER BY comic_id DESC LIMIT 0,1";
+}
+$getcomic2 = mysql_query($getcomic);
+$getcomic3 = mysql_fetch_array($getcomic2);
+
+$date = strtotime(get_meta($getcomic3['id'], 'pubDate'));
+
+?>
+                        <DIV CLASS="post">
+                                <DIV CLASS="date" TITLE="<?php echo(date('F jS Y g:i a', $date)); ?>">
+                                        <?php echo(date('M', $date)); ?><BR>
+                                        <?php echo(date('j', $date)); ?><BR>
+                                        <?php echo(date('Y', $date)); ?>
+
+                                </DIV>
+
+                                <DIV CLASS="title">
+                                        <H2><?php echo($getcomic3['title']); ?></H2>
+<?php
+
+if (has_meta($getcomic3['id'], 'author'))
+{
+?>
+                                        <CENTER><SMALL>Guest comic by <?php echo(get_meta($getcomic3['id'], 'author')); ?></SMALL></CENTER>
+<?php
+}
+
+?>
+                                </DIV>
+                        </DIV>
+
+                        <DIV CLASS="image">
+<?php
+
+if (has_meta($getcomic3['id'], 'link'))
+{
+?>
+                                <A HREF="<?php echo(get_meta($getcomic3['id'], 'link')); ?>">
+        <?php
+}
+?>
+                                <IMG SRC="/images/comics/<?php echo($getcomic3['filename']); ?>" ALT="<?php echo(htmlentities($getcomic3['text'])); ?>" TITLE="<?php echo(htmlentities($getcomic3['text'])); ?>">
+<?php
+
+if (has_meta($getcomic3['id'], 'link'))
+{
+?>
+                                </A>
+<?php
+}
+?>
+                        </DIV>
+
+                        <DIV CLASS="cleardiv"></DIV>
+
+                        <UL CLASS="navbar">
+<?php
+
+$id = $getcomic3['comic_id'];
+
+$cntcomics = "SELECT COUNT(*) FROM comics WHERE status = \"publish\"";
+$cntcomics2 = mysql_query($cntcomics);
+$cntcomics3 = mysql_fetch_array($cntcomics2);
+$all = $cntcomics3['COUNT(*)'];
+
+if ($id > 2)
+{
+?>                              <LI><A HREF="/comic1.htm">First</a></LI>
+<?php
+}
+
+if ($id > 1)
+{
+?>                              <LI><A HREF="/comic<?php echo($id-1); ?>.htm">Back</A></LI>
+<?php
+}
+
+if ($id < $all)
+{
+        if ($id != ($all-1))
+        {
+?>                              <LI><A HREF="/comic<?php echo($id+1); ?>.htm">Next</A></LI>
+<?php
+?>                              <LI><A HREF="/">Today</A></LI>
+<?php
+        } else {
+?>                              <LI><A HREF="/">Next</A></LI>
+<?php
+        }
+}
+
+$cntpending = "SELECT COUNT(*) FROM comics WHERE status = \"pending\"";
+$cntpending2 = mysql_query($cntpending);
+$cntpending3 = mysql_fetch_array($cntpending2);
+$numpending = $cntpending3['COUNT(*)'];
+
+?>
+                        </UL>
+
+                        <DIV CLASS="cleardiv"></DIV>
+
+                        <P>
+                                pillowcase - the result of an obsession with cute, plush objects that talk nonsense
+                        </P>
+
+                        <P>
+                                because we luv <A HREF="http://xkcd.com">xkcd</A>, make sure you look for the alt text
+                        </P>
+
+                        <P>
+<?php if ($numpending == 1): ?>
+                                there is 1 comic in the pending queue, which means that if Starla wants to be lazy and can't be bothered to update, she can relax for 1 more day before she starts getting angry emails
+<?php elseif ($numpending == 0): ?>
+                                oh dear, there aren't any comics in the pending queue, which means that if Starla doesn't hurry up, there may not be a comic tomorrow
+<?php elseif ($numpending > 100): ?>
+                                OMG! There are <?php echo($numpending); ?> comics in the pending queue! Starla, you relax as long as you want!
+<?php else: ?>
+                                there are <?php echo($numpending); ?> comics in the pending queue, which means that if Starla wants to be lazy and can't be bothered to update, she can relax for <?php echo($numpending); ?> days before she starts getting angry emails
+<?php endif; ?>
+                        </P>
+<?php
+
+$title = $getcomic3['title'];
+
+?>
@@ -1,10 +1,6 @@
 <?php
 
 $title = 'Contribute';
-include('header.php');
-
-if (!isset($_GET['submit']))
-{
 
 ?>
                         <H1>Contribute</H1>
@@ -15,8 +11,8 @@ if (!isset($_GET['submit']))
                         </P>
 
                         <P>
-                                First, of course, you have to actually write the comic. You can <A HREF="/template.png">download the template here</A>.
-                                There are some rules about how you can layout the comic, though.
+                                First, of course, you have to actually write the comic. You can <A HREF="/images/template.png">download the template 
+                                here</A>. There are some rules about how you can layout the comic, though.
 
                                 <UL>
                                         <LI>You are allowed to move around the pillowcase. You are also allowed to make him face the other way, make 
@@ -53,65 +49,3 @@ if (!isset($_GET['submit']))
                                 <A HREF="http://fourisland.com/fourm/memberlist.php?mode=viewprofile&u=2">contact her</A> with the comic image and 
                                 the required details. Thanks!
                         </P>
-<?php
-
-} else {
-        if ($_POST['title'] != '')
-        {
-                if ($_POST['text'] != '')
-                {
-                        $insimage = "INSERT INTO moderation (title, text, author) VALUES (\"" . mysql_real_escape_string($_POST['title']) . "\",\"" . mysql_real_escape_string($_POST['text']) . "\",\"" . mysql_real_escape_string($_POST['author']) . "\")";
-                        $insimage2 = mysql_query($insimage) or die($insimage);
-
-                        $id = mysql_insert_id();
-                        if ($id != 0)
-                        {
-                                if (move_uploaded_file($_FILES['comic']['tmp_name'], $_SERVER['DOCUMENT_ROOT'] . '/moderation/' . $id . '.png'))
-                                {
-?>
-                        <H1>Contribute</H1>
-
-                        <P>
-                                You have successfully uploaded a comic! Woo-hoo! Now, Starla will review it and (hopefully) add it to the pending 
-                                queue! Good luck!
-                        </P>
-<?php
-                                } else {
-                                        $delimage = "DELETE FROM moderation WHERE id = " . $id;
-                                        $delimage2 = mysql_query($delimage);
-
-?>
-                        <H1>Contribute</H1>
-
-                        <P>
-                                Uh oh, due to some unknown reason (are you sure you uploaded an image?), the comic upload failed! That's not good. 
-                                Please go back to the form and ensure you filled it in correctly.
-                        </P>
-<?php
-                                }
-                        }
-                } else {
-?>
-                        <H1>Contribute</H1>
-
-                        <P>
-                                Uh oh, you neglected to add an "alt text" description to your comic upload! That's a required field, so you have to 
-                                go back and try filling in the form again.
-                        </P>
-<?php
-                }
-        } else {
-?>
-                        <H1>Contribute</H1>
-
-                        <P>
-                                Uh oh, you neglected to add an title to your comic upload! That's a required field, so you have to go back and try 
-                                filling in the form again.
-                        </P>
-<?php
-        }
-}
-
-include('footer.php');
-
-?>
@@ -76,7 +76,7 @@ div.image {
 
 div#header h1 {
  text-indent: -9999px;
- background-image: url(/title.png);
+ background-image: url(/images/title.png);
  height: 115px;
  width: 500px;
 }
@@ -93,3 +93,7 @@ ul#archive {
  text-align: center;
  padding-left: 0;
 }
+
+a img {
+ border: 0;
+}