--- a/README.md
+++ b/README.md
@@ -1,3 +1,54 @@
-# efiction-3.5.6
-Efiction CMS version 3.5.6 
+# efiction v3.5.6
 
+non official version of 3.5.x efiction software
+
+## Only for testing purposes
+
+
+### Database changes:
+
+- all date fields from datestamp format to unix time format
+
+### File's changes
+
+- related date field type changes
+- found issues fixed
+- deleted bridges 
+
+### Looking for missing modules
+If you have source code of missing and used modules, share it and I can try to add and fix them
+
+
+### Installation
+No change
+
+### Update
+Classic as before, run update process that should change your date fields without lossing your data. It works only for update from 3.5.5, not sooner.
+
+
+
+<code>
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+see more in README.txt file
+</code>
+

--- /dev/null
+++ b/README.txt
@@ -1,1 +1,148 @@
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+
+There are notes in the docs/ folder about the changes to skins in this version.
+However, there is no tutorial as of yet.  
+
+It's also strongly suggested that you NOT put the site into maintenance mode or 
+start modifying the script (even by adding modules or blocks) until you've 
+actually confirmed that the install was successful.
+
+
+Upgrading from v.1.1:
+
+BACK UP YOUR FILES AND YOUR DATABASE FIRST!!  Upload the 3.0 files OVER your 1.1
+files.  DO NOT DELETE YOUR 1.1 FILES UNTIL THE UPGRADE IS COMPLETE!  Go to your site.  
+The script will detect that the config.php file is for 1.1 and start the upgrade.  
+
+Note: You're encouraged to choose one of the skins provided with the 3.0 
+script until you can update your 1.1 skins.  There are numerous changes in the
+skins from 1.1 to 3.0.  
+
+Note 2: Make sure your config.php file is CHMOD'd to 666.
+
+Upgrading from v.2.0.X:
+
+BACK UP YOUR FILES AND YOUR DATABASE FIRST!!  Upload the 3.0 files OVER your 2.0
+files.  DO NOT DELETE YOUR 2.0 FILES UNTIL THE UPGRADE IS COMPLETE!  Go to your site.  
+The script will detect that the config.php file is for 2.0 and start the upgrade.  
+
+Note: You're encouraged to choose one of the skins provided with the 3.0 
+script until you can update your 2.0 skins.
+
+Note 2: Make sure your config.php file is CHMOD'd to 666.
+
+Note 3: If you have installed blocks that did not come with the 2.0 package, 
+turn them off before starting the upgrade.  They will most likely be
+incompatible!
+
+Minor Upgrade from v.3.X to v.3.Y:
+
+BACK UP YOUR FILES AND YOUR DATABASE FIRST!!  Upload the 3.Y files OVER your 3.X
+files making sure you do not over-write your config.php file.  Generally, the images,
+tinymce, and skins folders will contain no updates and do not need to be replaced.
+Go to your eFiction site.  The script should detect the updated files and ask you 
+to update.  If it doesn't go to http://www.yoursite.com/update.php. 
+
+NOTE: If you have your site bridged, remember to put the bridge back in place 
+before running the update. 
+
+Brand New Install:
+
+If you know basic web stuff like CHMODing, look below at step #1. If you have
+no clue what you're doing, just go to http://www.yoursite.com/ after uploading 
+all the files to your server.
+
+1) If you intend to write the story texts to the server or allow image uploads, you
+must create a folder where these files will be stored. CHMOD this folder to 777.  
+During installation, the script will ask you for the location of this folder.  
+If this folder is missing the script will attempt to create it for you during the 
+install, but it is best if you create the folder yourself before beginning the
+installation script.  
+
+2) Move config.php from the docs folder to the main eFiction folder.  This file was
+placed in the docs folder to help prevent accidental overwriting of config.php
+for upgrades. If the config.php is missing the install script will attempt to 
+create it, but it's best if you move it.
+
+3) CHMOD config.php to 666.  
+
+4) Go to http://www.yoursite.com/ to run the install and set up the admin login.
+
+5) Login with the admin login and password set in step #4, and complete the
+configuration of your site through the Admin panel.
+
+Other info:
+
+1) As written, the script is intended to be used in the following way:
+
+- Categories: you can have only one category, or as many as you want, including 
+sub-categories.  Categories were written with the intention that they would 
+indicate different fandoms or categories of story.
+- Characters: Intended to mean the characters that fall within that fandom or 
+category.
+- Classifications: Beyond categories and characters you can set up your own 
+classifications such as genres, warnings, spoilers, story type, couple, etc.  
+- Series: Series are collections of related stories by the same or multiple 
+authors.  A story and its sequels, for example, would be a series.  Series 
+might also be used for a "shared universe" in which multiple authors write.  
+The person who creates the series is considered the series "owner" and
+controls whether or not the series is "open" to contributions by other 
+authors or not.  Even if the series is "closed", the series owner has the 
+option to include stories from other authors in the series.  
+- Challenges: Challenges are ideas/wishes for stories that a member or an 
+anonymous visitor "challenges" authors to write.  Stories written in response 
+to the challenge can be listed under the challenge by the story author or an admin.  
+Note: in 3.0 challenges have been made into an optional module.  To install 
+challenges goto http://www.yoursite.com/modules/challenges/install.php.
+
+Check out the Admin area for more information on all of these settings and more.
+
+2) You can modify most of the text that is displayed in the script by changing the 
+language file in the languages/ folder for the language you selected. Just change 
+the text within the quotes for each line to whatever you want it to say.  Some 
+wording is included within the skin's files.  If you have created a translation for 
+eFiction, we encourage you to share it!
+
+Original Developer:
+Rebecca Smallwood (Rivka)
+http://orodruin.sourceforge.net
+
+2.0 Developer: Tammy Keefer
+
+Released under the GPL.
+
+
+Credits:
+
+Fanfiction Script: Rebecca Smallwood (Rivka)
+TemplatePower Templating System: R.P.J. Velzeboer, http://templatepower.codocad.com/
+
+A Big Thank You to my original Beta-testers: Theresa Sanchez, Khuffie, Mona Carol-Kaufman, 
+Michele Bumbarger, Stephanie Smith, eFanfiction, Amy Cheng, arakune, Peganino, Ceit, 
+brihana25, Annabelle Crane
+
+Big thanks also to the 2.0 beta-testers: babaca, Jayelle, Carrie, Nicole, eyedam, 
+Dreamhowler, Roberto-san, Calic0cat, West4me, emmekappa, Osfer, Sarit, Silvermoon, 
+Carissa, Jan_AQ, Lazuli
+
+Also thanks for our 3.0 Beta testers who were too many to name.

--- /dev/null
+++ b/admin.php
@@ -1,1 +1,91 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+$current = "adminarea";
+
+if(isset($_GET['action']) && ($_GET['action'] == "categories" || $_GET['action'] == "admins")) $displayform = 1;
+
+$disableTiny = true;
+
+include ("header.php");
+
+
+
+//make a new TemplatePower object
+if(file_exists("$skindir/default.tpl")) $tpl = new TemplatePower( "$skindir/default.tpl" );
+else $tpl = new TemplatePower("default_tpls/default.tpl");
+include("includes/pagesetup.php");
+if(file_exists("languages/".$language."_admin.php")) include_once("languages/".$language."_admin.php");
+else include_once("languages/en_admin.php");
+// end basic page setup
+
+// check that user has permissions to perform this action before going further.  Otherwise kick 'em
+	if(!isADMIN) accessDenied( );
+	$adminquery = dbquery("SELECT categories FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE uid = '".USERUID."' LIMIT 1");
+	list($admincats) = dbrow($adminquery);
+	if(empty($admincats)) $admincats = "0";
+	$output = "<div style='text-align: center; margin: 1em;'>";
+	$panelquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden != '1' AND panel_type = 'A' AND panel_level >= ".uLEVEL." ORDER BY panel_level DESC, panel_order ASC, panel_title ASC");
+	if(!dbnumrows($panelquery)) $output .= _FATALERROR;
+	$panellist = array();
+	while($panel = dbassoc($panelquery)) {
+		if(!$panel['panel_url']) $panellist[$panel['panel_level']][]= "<a href=\"admin.php?action=".$panel['panel_name']."\">".$panel['panel_title']."</a>";
+		else $panellist[$panel['panel_level']][] = "<a href=\"".$panel['panel_url']."\">".$panel['panel_title']."</a>";
+	}
+	foreach($panellist as $accesslevel => $row) {
+		$output .= implode(" | ", $row)."<br />";
+	}
+	$output .= "</div>\n";
+	if($action) {
+		$panelquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_name = '$action' AND panel_type = 'A' LIMIT 1");
+		if(dbnumrows($panelquery)) {
+			$panel = dbassoc($panelquery);
+			if((isset($panel['panel_level']) ? $panel['panel_level'] : 0) >= uLEVEL) {
+				if($panel['panel_url'] && file_exists(_BASEDIR.$panel['panel_url'])) require_once(_BASEDIR.$panel['panel_url']);
+				else if (file_exists("admin/{$action}.php")) require_once("admin/{$action}.php");
+			}
+			else accessDenied( );
+		}
+	}
+	else {
+		if (file_exists("install"))
+			$output .= write_error(_SECURITYDELETE);
+		$adminnotices = "";
+		$countquery = dbquery("SELECT COUNT(DISTINCT chapid) FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated < 1");
+		list($count) = dbrow($countquery);
+		if($count) $adminnotices .= write_message(sprintf(_QUEUECOUNT, $count));
+		$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'adminnotices'");
+		while($code = dbassoc($codequery)) {
+			eval($code['code_text']);
+		}
+
+		$output .= write_message("Actual time: ". time() );
+		$output .= write_message("Date format: " . $dateformat);
+		$output .= write_message(date("$dateformat", time())); 	
+ 
+		$output .= write_message($adminnotices);
+		$output .= write_message(_RUNNINGVERSION);
+	}	
+	$tpl->assign( "output", $output );
+	$tpl->printToScreen();
+	dbclose( );
+?>

--- /dev/null
+++ b/admin/admins.php
@@ -1,1 +1,118 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+	if(isset($_GET['do'])) $do = $_GET["do"];
+	else $do = false;
+	if(isset($_GET["revoke"])) {
+		if(isset($_GET["confirm"])) {
+			$output .= "<div id='pagetitle'>"._REVOKEADMIN."</div>";
+			if($_GET["confirm"] == "yes" && USERUID != $_GET['revoke']) {
+				$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET level = '0' WHERE uid = '".$_GET['revoke']."'");
+				if($result) $output .=  write_message(_ACTIONSUCCESSFUL);
+				else {
+					$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorprefs(`level`, `uid`) VALUES ('0', '".$_GET['revoke']."')"); // shouldn't be possible, but better safe than sorry.
+					$output .= write_error(_ERROR." "._TRYAGAIN);
+				}
+			}
+			else 
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_CONFIRMADMINREVOKE." [ <a href=\"admin.php?action=admins&confirm=yes&revoke=".$_GET['revoke']."\">"._YES."</a> | <a href=\"admin.php?action=admins&confirm=no&revoke=".$_GET['revoke']."\">"._NO."</a> ]</center>");
+		}
+	}
+	else if($do) {
+		if(isset($_POST['submit'])) {
+			$contact = (isset($_POST['contact']) && $_POST['contact'] == "on" ? "1" : "0");
+			if($_POST['catid']) $categories = $_POST['catid'];
+			else $categories = "0";
+			if(check_prefs($_POST['uid'])) $result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET level = '".$_POST['adlevel']."', contact = '$contact', categories = '$categories' WHERE uid = '".$_POST['uid']."'");
+			else $result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorprefs(`level`, `contact`, `categories`,  `uid`) VALUES ('".$_POST['adlevel']."', '$contact', '$categories', '".$_POST['uid']."')");
+			if($result) $output .= write_message(_ACTIONSUCCESSFUL._BACK2ADMIN);
+			else $output .= write_message(_ERROR);
+		}
+		else {
+			if($do == "edit") {
+				$uid = $_GET['uid'];
+				$info = dbquery("SELECT "._PENNAMEFIELD." as penname, level, categories, contact FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE "._UIDFIELD." = '$uid' LIMIT 1");
+				list($penname, $adlevel, $adcategories, $adcontact) = dbrow($info);
+				$catid = explode(",", $adcategories);
+			}
+			$uid = isset($_REQUEST['uid']) ? $_REQUEST['uid'] : false;
+			if(!isNumber($uid)) $uid = false;
+			$output .= "<div id=\"pagetitle\">".($do == "edit" ? _EDITADMIN : _ADDADMIN)."</div>
+				<form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"admin.php?action=admins&do=$do\">
+				<div><label for=\"uid\">"._PENNAME.": </label>";
+			if($do == "new") {
+				$query = dbquery("SELECT "._PENNAMEFIELD." AS penname, "._UIDFIELD." AS uid, ap.level FROM "._AUTHORTABLE." LEFT  JOIN ".TABLEPREFIX."fanfiction_authorprefs AS ap ON "._UIDFIELD." = ap.uid ORDER  BY "._PENNAMEFIELD);
+				$output .= "<select name=\"uid\">";
+				while($users = dbassoc($query)) {
+					if(!$users['level']) $output .= "<option value=\"".$users['uid']."\"".($uid == $users['uid'] ? " selected" : "").">".$users['penname']."</option>";
+				}	
+				$output .= "</select></div>";
+			}
+			else if($do == "edit" && !empty($uid)) {
+				$output .= $penname."<input type=\"hidden\" name=\"uid\" value=\"$uid\"></div>";
+			}
+			$output .= "<div><label for=\"adlevel\">"._LEVEL.":</label>  <select name=\"adlevel\">";
+				for($x = 1; $x < 5; $x++) {
+					$output .= "<option value=\"$x\"".(isset($adlevel) && $adlevel == $x ? " selected" : "").">$x</option>";
+				}
+			$output .= "</select><A HREF=\"#adlevel\" class=\"pophelp\">[?]<span>"._HELP_ADLEVEL."</span></A></div>";
+			include("includes/categories.php");
+			$output .= (isset($adcategories) ? "<input type=\"hidden\" name=\"oldcats\" value=\"$adcategories\">" : "")."
+				<div><label for=\"contact\">"._CONTACT.":</label>
+				<INPUT type=\"checkbox\" class=\"checkbox\" name=\"contact\"".(isset($adcontact) && $adcontact == 1 ? " checked" : "").">
+				<A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CONTACTSUB."</span></A></div>
+				<INPUT type=\"submit\" class=\"button\" id=\"submit\" value=\""._SUBMIT."\" name=\"submit\">
+				</form>";
+		}
+	}
+	else if(isset($_GET['category'])) {
+		$where = "WHERE (categories = '0' OR FIND_IN_SET('".$_GET['category']."', categories) > 0) AND ap.level > 0";
+		list($category) = dbrow(dbquery("SELECT category FROM ".TABLEPREFIX."fanfiction_categories WHERE catid = '".$_GET['category']."' LIMIT 1"));
+		$output .= "<center><p><b>$category "._ADMINS."</b></p>";
+		$authorlink = "<a href=\"admin.php?action=admins&amp;do=edit&amp;uid=";
+		$pagelink = "admin.php?action=admin&amp;category=".$_GET['category']."&amp;";
+		$countquery = "SELECT count(uid) FROM ".TABLEPREFIX."fanfiction_authorprefs as ap $where";
+		$authorquery = "SELECT count(stories.sid) as stories, "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid FROM ".TABLEPREFIX."fanfiction_authorprefs as ap, "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_stories as stories ON ("._UIDFIELD." = stories.uid) AND "._UIDFIELD." > 0 AND stories.validated > 0 $where AND ap.level > 0 ".(isset($letter) ? " AND $letter" : "")." AND ap.uid = "._UIDFIELD." GROUP BY "._UIDFIELD;
+		include("includes/members_list.php");
+		$output .= "<p><a href=\"admin.php?action=admins&do=new&category=".$_GET['category']."\">"._ADDADMIN."</a></p>";
+	}
+	else {
+
+		if($let == _OTHER) $letter = _PENNAMEFIELD." REGEXP '^[^a-z]'";
+		else $letter = _PENNAMEFIELD." LIKE '".$let."%'";
+		$output .= "<div class=\"sectionheader\">"._ADMINS."</div>";
+		$authorlink = "<a href=\"admin.php?action=admins&amp;do=edit&amp;uid=";
+		$pagelink = "admin.php?action=admins&amp;";
+		$countquery = "SELECT count(uid) FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE level > 0";
+		$authorquery = "SELECT "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid, count(stories.uid) as stories FROM (".TABLEPREFIX."fanfiction_authorprefs as ap, "._AUTHORTABLE.") LEFT JOIN ".TABLEPREFIX."fanfiction_stories as stories ON ("._UIDFIELD." = stories.uid) AND stories.validated > 0 WHERE ap.level > 0 ".(isset($letter) ? " AND $letter" : "")." AND ap.uid = "._UIDFIELD." GROUP BY "._UIDFIELD;
+		include("includes/members_list.php");
+		$output .= write_message("<a href=\"admin.php?action=admins&do=new\">"._ADDADMIN."</a>");
+	}
+
+?>

--- /dev/null
+++ b/admin/authorfields.php
@@ -1,1 +1,126 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$field = isset($_GET['field']) ? $_GET['field'] : false;
+$list = true;
+$fieldtypes = array("1" => _FIELDURL, "2" => _FIELDSELECT, "3" => _FIELDYESNO, "4" => _FIELDIDURL, "5" => _FIELDCUSTOM, "6" => _TEXT);
+if(!empty($_GET['delete'])) {
+	$delete = $_GET['delete'];
+	$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+	if($confirm == "yes" && isNumber($delete)) {
+		$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_authorfields WHERE field_id = '$delete' LIMIT 1");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+
+	}
+	else if($confirm == "no") {
+		$output .= write_message(_ACTIONCANCELLED);
+	}
+	else {
+		$output .= write_message(_CONFIRMDELETE."<br /><br />
+					[ <a href=\"admin.php?action=authorfields&amp;delete=$delete&amp;confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=authorfields&amp;delete=$delete&amp;confirm=no\">"._NO."</a> ]");
+
+	}
+}
+if(!empty($_GET['edit'])) {
+	$new = $_GET['edit'] == "new" ? true : false;
+	if(isset($_POST['submit'])) {
+		$field_name = isset($_POST['field_name']) ? descript($_POST['field_name']) : "";
+		$field_title = isset($_POST['field_title']) ? descript($_POST['field_title']) : "";
+		$field_type = isset($_POST['field_type']) && isNumber($_POST['field_type'])? $_POST['field_type'] : "0";
+		$field_on = isset($_POST['field_on']) && $_POST['field_on'] == "on" ? "1" : "0";
+		$field_options = "";
+		$code_in = "";
+		$code_out = "";
+		if(!$field_type) {
+			$output .= write_error(_NOFIELDTYPE);	
+		}
+		else {
+			if($field_type == 4) $field_options = isset($_POST['options_4']) ? descript($_POST['options_4']) : "";
+			if($field_type == 2) $field_options = implode("|#|", explode("\r\n", ltrim(strip_tags(preg_replace( '!<p>!iU', "\r\n",  stripslashes(trim($_POST['options_2']))), preg_replace("!<p>!iu", "", $allowed_tags)))));
+			if($field_type == 5) {
+				$code_in = isset($_POST['code_in']) ? descript($_POST['code_in']) : "";
+				$code_out = isset($_POST['code_out']) ? descript($_POST['code_out']) : "";
+			}
+			if($new) {
+				$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorfields(`field_name`, `field_title`, `field_type`, `field_options`, `field_code_in`, `field_code_out`, `field_on`) 
+					VALUES('".escapestring($field_name)."', '".escapestring($field_title)."', '$field_type', '".escapestring($field_options)."', '".escapestring($code_in)."', '".escapestring($code_out)."', '$field_on');");
+			}
+			else {
+				$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorfields SET field_type = '$field_type', field_name = '".escapestring($field_name)."', field_title = '".escapestring($field_title)."', field_options = '".escapestring($field_options)."', field_code_in = '".escapestring($code_in)."', field_code_out = '".escapestring($code_out)."', field_on = '$field_on' WHERE field_id = '".$_GET['edit']."'");
+			}
+			if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+			else $output .= write_error(_ERROR);
+		}
+	}
+	else {
+		if($new) {
+			$fieldinfo = array("field_type" => "", "field_id" => "", "field_name" => "", "field_title" => "", "field_options" => "", "field_code_in" => "", "field_code_out" => "", "field_on" => "0");
+		}
+		else {
+			$fieldinfo = dbassoc(dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_authorfields WHERE field_id = '".$_GET['edit']."' LIMIT 1"));
+		}
+		$output .= "
+		<div class='sectionheader'>".($new ? _ADDFIELD : _EDITFIELD)."</div>
+			<div><form method=\"POST\" id='settingsform' enctype=\"multipart/form-data\" action=\"admin.php?action=authorfields&amp;edit=".$_GET['edit']."\">
+			<label for='field_name'>"._NAME.":</label> <input type='text' class='textbox' name='field_name' id='field_name' value='".$fieldinfo['field_name']."'><br />
+			<label for='field_title'>"._TITLE.":</label> <input type='text' class='textbox' name='field_title' id='field_title' value='".$fieldinfo['field_title']."'><br />
+			<div><label for='field_on'>"._FIELDON.":</label> <input type='checkbox' name='field_on' id='field_on'".($fieldinfo['field_on'] ? " checked='checked'" : "")."></div>
+			<label for='field_type'>"._TYPE.":</label> <select name='field_type' id='field_type' onchange=\"javascript:displayTypeOpts()\">";
+		foreach($fieldtypes as $id => $name) {
+				$output .= "<option value='$id'".(isset($fieldinfo) && $fieldinfo['field_type'] == $id ? " selected" : "").">$name</option>";
+		}
+		$output .= "</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_FIELDTYPE."</span></A><br />
+			<div id='opt_2'".($fieldinfo['field_type'] == 2 ? "" :"style='display: none;'")."><label for='options_2'>"._FIELDSELECT.":</label><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_FIELDSELECT."</span></A><div style='margin-left: 30%; padding-left: 1em;'><textarea style='width: 100%; height: 150px;' name='options_2' cols='35' rows='4' class='mceNoEditor' id='options_2'>".($fieldinfo['field_type'] == 2 ? preg_replace("@\|#\|@", "\n", stripslashes($fieldinfo['field_options'])) : "")."</textarea></div>";
+				if($tinyMCE) 
+				$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('options_2');\"><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+		$output .= "</div>
+			<div id='opt_4'".($fieldinfo['field_type'] == 4 ? "" :"style='display: none;'")."><label for='options_4'>"._FIELDIDURL.":</label><input type='text' name='options_4' id='options_4' ".($fieldinfo['field_type'] == 4 ? "value='".stripslashes($fieldinfo['field_options'])."'" : "")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_FIELDIDURL."</span></A></div>
+			<div id='opt_5'".($fieldinfo['field_type'] == 5 ? "" :"style='display: none;'").">
+				<label for='code_in'>"._FIELDCODEIN.":</label><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_FIELDCODEIN."</span></A><div style='margin-left: 30%; padding-left: 1em;'><textarea cols='35' rows='4' style='width: 100%; height: 150px;' name='code_in' class='mceNoEditor' id='code_in'>".stripslashes($fieldinfo['field_code_in'])."</textarea>";
+		$output .= "</div>
+				<label for='code_out'>"._FIELDCODEOUT.":</label><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_FIELDCODEOUT."</span></A><div style='margin-left: 30%; padding-left: 1em;'><textarea name='code_out' cols='35' rows='4'  style='width: 100%; height: 150px;' class='mceNoEditor' id='code_out'>".stripslashes($fieldinfo['field_code_out'])."</textarea>";
+		$output .= "</div>
+			</div>
+			<div id='submitdiv'><INPUT type='submit' id='submit' class='button' value='"._SUBMIT."' name='submit'></div></form><div class='cleaner'>&nbsp;</div></div>";
+
+		$list = false;
+	}
+}
+else if(!empty($_GET['delete'])) {
+
+}
+if($list) {
+	$fields = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_authorfields");
+	if(dbnumrows($fields) > 0) {
+		$output .= "<table class='tblborder' style='margin: 0 auto;'><tr><th class='tblborder'>"._NAME."</th><th class='tblborder'>"._STATUS."</th><th class='tblborder'>"._OPTIONS."</th></tr>";
+		while($field = dbassoc($fields)) {
+			$output .= "<tr><td class='tblborder'>".(empty($field['field_title']) ? $field['field_name'] : $field['field_title'])."</td><td class='tblborder' style='text-align: center;'>".($field['field_on'] ? _ON : _OFF)."</td><td class='tblborder'><a href='admin.php?action=authorfields&amp;edit=".$field['field_id']."'>"._EDIT."</a> | <a href='admin.php?action=authorfields&amp;delete=".$field['field_id']."'>"._DELETE."</a></td></tr>";
+		}
+		$output .= "<tr><td class='tblborder' colspan='3' style='text-align: center;'><a href='admin.php?action=authorfields&amp;edit=new'>"._ADDNEWFIELD."</a></td></tr></table>";
+	}
+}
+?>

--- /dev/null
+++ b/admin/backup.php
@@ -1,1 +1,84 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+//
+// Size fix / UTF-8 feature 2016-05-18
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+define("_BASEDIR", "../");
+include("../config.php");
+
+$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '$sitekey'");
+$settings = dbassoc($settingsresults);
+foreach($settings as $var => $val) {
+	$$var = stripslashes($val);
+	$settings[$var] = htmlspecialchars($val);
+}
+if(!defined("SITEKEY")) define("SITEKEY", $settings['sitekey']);
+unset($settings['sitekey']);
+if(!defined("TABLEPREFIX")) define("TABLEPREFIX", $settings['tableprefix']);
+unset($settings['tableprefix']);
+$debug = 0;
+include("../languages/".$language.".php");
+include("../languages/".$language."_admin.php");
+$file_name = str_replace(" ", "_", $sitename).date("m-d-Y").".sql";
+Header("Content-type: application/octet-stream");
+Header("Content-Disposition: attachment; filename=" . $file_name . "");
+
+session_start( );
+require_once("../includes/queries.php");
+require_once("../includes/get_session_vars.php");
+$debug = false;  // Because we don't want debug info mucking up our backup.
+
+if(!isADMIN) die( );
+
+// Database backup
+function datadump ($table) {
+    echo "# Dump of $table \r\n";
+    echo "# Dump DATE : " . date("d-M-Y") ."\r\n\r\n";
+
+    $tabledata = dbquery("SELECT * FROM $table");
+
+	while($t = dbassoc($tabledata)) {
+		echo "INSERT INTO ".$table." ";
+		$row = array( );
+		foreach($t AS $field => $value) {			
+			$value = escapestring($value);
+			$value = str_replace("\n","\\n",$value);
+			if (isset($value)) $row[$field] = "\"$value\"";
+			else $row[$field] = "\"\"";
+		}   
+		echo "VALUES(".implode(", ", $row).");\r\n";
+	}
+	echo "\r\n\r\n\r\n";
+}
+
+	$alltables = dbquery("SHOW TABLES");
+
+	while ($table = dbassoc($alltables)) {
+			datadump(current($table));
+	}
+
+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");
+	exit( );
+
+?>

--- /dev/null
+++ b/admin/backup_utf8.php
@@ -1,1 +1,86 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+//
+// Size fix / UTF-8 feature 2016-05-18
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+define("_BASEDIR", "../");
+$action = "backup";
+include("../config.php");
+
+$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey = '$sitekey'");
+$settings = dbassoc($settingsresults);
+foreach($settings as $var => $val) {
+	$$var = stripslashes($val);
+	$settings[$var] = htmlspecialchars($val);
+}
+if(!defined("SITEKEY")) define("SITEKEY", $settings['sitekey']);
+unset($settings['sitekey']);
+if(!defined("TABLEPREFIX")) define("TABLEPREFIX", $settings['tableprefix']);
+unset($settings['tableprefix']);
+$debug = 0;
+include("../languages/".$language.".php");
+include("../languages/".$language."_admin.php");
+$file_name = str_replace(" ", "_", $sitename).date("m-d-Y").".sql";
+header("Content-Type: text/html; charset=utf-8");
+Header("Content-type: application/octet-stream");
+Header("Content-Disposition: attachment; filename=".$file_name."");
+
+session_start( );
+require_once("../includes/queries.php");
+require_once("../includes/get_session_vars.php");
+$debug = false;  // Because we don't want debug info mucking up our backup.
+
+if(!isADMIN) die( );
+
+// Database backup
+function datadump ($table) {
+    echo "# Dump of $table \r\n";
+    echo "# Dump DATE : " . date("d-M-Y") ."\r\n\r\n";
+
+    $tabledata = dbquery("SELECT * FROM $table");
+
+	while($t = dbassoc($tabledata)) {
+		echo "INSERT INTO ".$table." ";
+		$row = array( );
+		foreach($t AS $field => $value) {			
+			$value = utf8_encode (escapestring($value) );
+			$value = str_replace("\n","\\n",$value);
+			if (isset($value)) $row[$field] = "\"$value\"";
+			else $row[$field] = "\"\"";
+		}   
+		echo "VALUES(".implode(", ", $row).");\r\n";
+	}
+	echo "\r\n\r\n\r\n";
+}
+
+	$alltables = dbquery("SHOW TABLES");
+
+	while ($table = dbassoc($alltables)) {
+			datadump(current($table));
+	}
+
+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_BACKUP, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");
+	exit( );
+
+?>

--- /dev/null
+++ b/admin/blocks.php
@@ -1,1 +1,117 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+function save_blocks( $blocks ) {
+	
+	foreach($blocks as $block =>$value) {
+		unset($blockvars);
+		if((isset($_GET['admin']) && $_GET['admin'] != $block) || (isset($_GET['init']) && $_GET['init'] != $block)) continue;
+		foreach($value as $var=>$val) {
+			if($var != "name" && $var != "title" && $var != "file" && $var != "status") $blockvars[$var] = $val;
+		}
+		$tmp_title = isset($value['title']) ? escapestring($value['title']) : "";
+		$tmp_file  = isset($value['file']) ?  $value['file'] : "";
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_blocks SET block_name = '$block', block_title = '". $tmp_title."', block_file = '". $tmp_file."', block_status = '".$value['status']."', block_variables =  '".(isset($blockvars) ? addslashes(serialize($blockvars)) : "")."' WHERE block_name = '$block'");
+	}
+}
+if(isset($_GET['admin'])) $admin = $_GET['admin'];
+else $admin = false;
+$content = "";
+
+	if($admin) {
+		$output .= "<div id='pagetitle'>"._ADMIN." - ".(isset($blocks[$_GET['admin']]['title']) ? $blocks[$_GET['admin']]['title'] : "")."</div>";
+		include("blocks/".$_GET['admin']."/admin.php");
+		save_blocks( $blocks );
+	}
+	if(isset($_GET['init'])) {
+		if(file_exists("blocks/".$_GET['init']."/init.php")) include("blocks/".$_GET['init']."/init.php");
+		else return _ERROR;
+		save_blocks( $blocks );
+	}
+
+	if(isset($_POST['submit']) && empty($admin)) {
+		$x = 1;
+ 
+		while(isset($_POST[$x])) {
+			// activate inactive blocks.
+			if(isset($blocks[$_POST[$x]])) {
+				$tmp_title  = isset($_POST[$x . "_title"]) ? descript($_POST[$x . "_title"]) : "";
+				$tmp_status = isset($_POST[$x . "_status"]) ? descript($_POST[$x . "_status"]) : "";
+				$blocks[$_POST[$x]]['title'] = $tmp_title;
+				$blocks[$_POST[$x]]["status"] = $tmp_status;
+			}
+			$x++;	
+		}
+		save_blocks( $blocks );
+		$output .= write_message(_ACTIONSUCCESSFUL);
+	}
+// In case the skin has already overridden the block settings or we've just changed the settings.
+
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks");
+while ($block = dbassoc($blockquery))
+{
+	if ($block['block_variables'] > 0)
+	{
+		$block_vars = @unserialize($block['block_variables']);
+		if ($block_vars)
+		{
+			$blocks[$block['block_name']] = $block_vars;
+		}
+		//else
+		//{
+		//	print_r($block);
+		//}
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	$blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+	unset($content);
+
+if(empty($admin)) {
+	$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks\"><center><table class=\"tblborder\" cellpadding=\"3\"><tr><th>"._NAME."</th><th>"._TITLE."</th><th>"._STATUS."</th><th>"._ADMIN."</th></tr>";
+	$x = 1;
+	$directory = opendir("blocks");
+	while($filename = readdir($directory)) {
+			if($filename=="." || $filename==".." || !is_dir("blocks/".$filename)) continue;
+			$output .= "<tr><td class=\"tblborder\"><input type=\"hidden\" name=\"$x\" value=\"$filename\">$filename</td>";
+			if(isset($blocks[$filename]['file'])) $output .= "<td class=\"tblborder\"><input name=\"{$x}_title\" type=\"text\" class=\"textbox\" value=\"".stripslashes($blocks[$filename]['title'])."\"><input name=\"{$x}_file\" type=\"hidden\" value=\"".$blocks[$filename]['file']."\"></td>
+				<td class=\"tblborder\"><select name=\"{$x}_status\">
+					<option value=\"0\"".(!$blocks[$filename]['status'] ? " selected" : "").">"._INACTIVE."</option>
+					<option value=\"1\"".($blocks[$filename]['status'] == 1? " selected" : "").">"._ACTIVE."</option>
+					<option value=\"2\"".($blocks[$filename]['status'] == 2 ? " selected" : "").">"._INDEXONLY."</option>
+					</select></td>
+				<td class=\"tblborder\">".(file_exists("blocks/$filename/admin.php") ? "<a href=\"admin.php?action=blocks&admin=$filename\">"._OPTIONS."</a>" :  _NONE);
+			else $output .= "<td class=\"tblborder\" colspan=\"3\" align=\"center\"><a href=\"admin.php?action=blocks&init=$filename\">"._INITIALIZE."</a>";
+			$output .= "</td></tr>";
+			$x++;
+	}
+	closedir($directory);
+	$output .= "</table><br /><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form>";
+}
+// Now load the skin settings back in.
+	if(file_exists("$skindir/variables.php")) include("$skindir/variables.php"); 
+?>

--- /dev/null
+++ b/admin/categories.php
@@ -1,1 +1,235 @@
-
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+function build_cat_row($thiscat, $thiscatinfo) {
+	global $catlist, $oddeven, $onpic, $down, $up;
+	$space = "";
+	if($thiscatinfo['leveldown'] % 2) $class = "odd";
+	else $class = "even";
+	for($count = 0; $count < $thiscatinfo['leveldown']; $count++) {
+		$space .= "&nbsp;&nbsp;&nbsp;";
+	}
+	$output = "<tr id='catid_".$thiscat."' ".($thiscatinfo['leveldown'] > 0 ? "style='display: none;'" : "")." class='$class'>\n\t<td class='tblborder'>".$space;
+	$subs = ""; $downlink = "&nbsp;"; $uplink = "&nbsp;";
+	$$thiscat = $catlist;
+	foreach($$thiscat as $cat => $catinfo) {
+		if($catinfo['pid'] == $thiscatinfo['pid'] && $thiscatinfo['order'] > $catinfo['order']) $uplink = "<a href=\"admin.php?action=categories&go=up&displayorder=".$thiscatinfo['order']."&parentcatid=".$thiscatinfo['pid']."\">$up</a>";
+		if($catinfo['pid'] == $thiscatinfo['pid'] && $thiscatinfo['order'] < $catinfo['order']) $downlink = "<a href=\"admin.php?action=categories&go=down&displayorder=".$thiscatinfo['order']."&parentcatid=".$thiscatinfo['pid']."\">$down</a>";
+		if($catinfo['pid'] == $thiscat) $subs .= build_cat_row($cat, $catinfo);
+	}
+	if($subs) $output .= "<img onclick=\"javascript:displayCatRows('$thiscat')\" name='c_$thiscat' alt='on' src='".($onpic ? $onpic : "images/row_on.gif")."'> ";
+	$output .= $thiscatinfo['name']."</td>\n
+	<td class='tblborder'>$downlink</td>\n
+	<td class='tblborder' width=\"13\">$uplink</td>\n
+	<td class='tblborder'><a href=\"admin.php?action=categories&cat=$thiscat\">"._EDIT."</a> | <a href=\"admin.php?action=categories&delete=$thiscat\">"._DELETE."</a> 
+			| <span class='label'>"._ADD.":</span> $space <a href=\"admin.php?action=categories&cat=new&subof=$thiscat\">"._SUBCATEGORY."</a>, <a href=\"admin.php?action=characters&do=addform&catid=$thiscat\">"._CHARACTERS."</a>,  <a href=\"admin.php?action=admins&category=$thiscat\">"._ADMINS."</a></td>\r\n</tr>$subs";
+	return $output;
+}
+
+function relevelcategory($cat, $leveldown) {
+	global $action;
+
+	$subs = dbquery("SELECT catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '$cat'");
+	if(dbnumrows($subs)) {
+		while($sub = dbassoc($subs)) {relevelcategory($sub[catid], $leveldown + 1); }
+	}
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET leveldown = $leveldown WHERE catid = '$cat'");
+}
+
+
+	$showlist = 1;
+	$output .= "<div id=\"pagetitle\">"._CATEGORIES." </div>";
+	if(isset($_GET['catcounts'])) 
+		$output .= catcounts( );
+	if(isset($_GET["delete"]) && isNumber($_GET["delete"])) {
+		$catid = $_GET["delete"];
+		$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+		if($confirm == "yes") {
+			$result = dbquery("SELECT displayorder,leveldown, parentcatid FROM ".TABLEPREFIX."fanfiction_categories WHERE catid = '$catid'");
+			$cat = dbassoc($result);
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = (displayorder - '1') WHERE displayorder > '$cat[displayorder]' AND parentcatid = '$cat[parentcatid]'");
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_categories WHERE catid = '$catid'");
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '$catid'");
+			$stories = dbquery("SELECT title,sid, catid FROM ".TABLEPREFIX."fanfiction_stories WHERE FIND_IN_SET(catid, '$catid')");
+			while($story = dbassoc($stories)) {
+				$cats = explode(",", $story[catid]);
+				if(count($cats) == 1) $newcat = "-1";
+				else $newcat = implode(",", array_dif($cats, array($catid)));
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET catid = '$newcat' WHERE sid = '$story[sid]' LIMIT 1");					
+			}
+			$code = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'delcategory'");
+			while($c = dbassoc($code)) {
+				eval($c['code_text']);
+			}
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no") {
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$showlist = 0;
+			$output .= write_message(_CONFIRMDELETE."<br /><br />
+[ <a href=\"admin.php?action=categories&delete=$catid&confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=categories&delete=$catid&confirm=no\">"._NO."</a> ]");
+		}
+	}
+	if (isset($_POST["submit"]) && !isset($_GET['catcounts'])) {
+		if(isset($_POST['catid']) && $_POST['parentcatid'] == $_POST['catid']) {
+			$output .= write_error(_ACTIONCANCELLED." "._CATERROR);
+			$tpl->assign( "output", $output );
+			$tpl->printToScreen();
+			dbclose( );
+			exit( );
+		}
+		if($_POST['parentcatid'] != "-1") 	{
+			$parentquery = dbquery("SELECT leveldown FROM ".TABLEPREFIX."fanfiction_categories WHERE catid = '$_POST[parentcatid]'");
+			$parentresult = dbassoc($parentquery);
+			$leveldown = $parentresult['leveldown'] + 1;
+		}
+		else $leveldown = 0;
+		$locked = (isset($_POST['locked']) && $_POST['locked'] == "on" ? "1" : "0");
+
+		$displayorder = (isNumber($_POST['orderafter']) ? $_POST['orderafter'] : 0) + 1;
+		if($_GET["cat"] == "new") { 
+			$query = dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = (displayorder + 1) WHERE displayorder > '".$_POST['orderafter']."' AND leveldown = '$leveldown' AND parentcatid ='".$_POST['parentcatid']."'");
+			$catresult = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_categories (category, parentcatid, description, locked, image, leveldown, displayorder) VALUES ('".addslashes(descript(strip_tags(trim($_POST['category']))))."', '".$_POST['parentcatid']."', '".addslashes(descript($_POST['description']))."', '$locked', '".$_POST['image']."', '$leveldown', '$displayorder')");
+		}
+		else {
+			$oldinfo = dbquery("SELECT displayorder, parentcatid, leveldown FROM ".TABLEPREFIX."fanfiction_categories WHERE catid = '$_GET[cat]' LIMIT 1");
+			list($oldorder, $oldparent, $oldleveldown) = dbrow($oldinfo);
+			$catresult = "UPDATE ".TABLEPREFIX."fanfiction_categories SET category = '".addslashes(descript($_POST['category']))."', description = '".addslashes(descript($_POST['description']))."', locked = '$locked', parentcatid = '".$_POST['parentcatid']."', image = '".$_POST['image']."', leveldown = '$leveldown', displayorder = '$displayorder' WHERE catid = '".$_POST['catid']."'";
+			if($oldparent == $_POST['parentcatid']) {
+				if($oldorder && $oldorder < $displayorder) {
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = displayorder - 1 WHERE displayorder > $oldorder AND displayorder < $displayorder");
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $displayorder - 1 WHERE catid = '".$_GET['cat']."'");
+				}
+				if($oldorder > $displayorder) {
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = displayorder + 1 WHERE displayorder >= $displayorder AND displayorder < $oldorder");
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $displayorder WHERE catid = '".$_GET['cat']."'");
+				}
+			} 
+			else {
+				if($oldleveldown != $leveldown) relevelcategory($_GET['cat'], $leveldown);
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = displayorder -1 WHERE displayorder > $oldorder AND parentcatid = '$oldparent'");
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = displayorder + 1 WHERE displayorder > '".$_POST['orderafter']."' AND parentcatid = '".$_POST['parentcatid']."'");
+			}
+			$success = dbquery($catresult);
+		}
+		$selectA = "SELECT category, catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = -1 ORDER BY displayorder";
+		$resultA = dbquery($selectA);
+		$countA = 1;
+		while($cat = dbassoc($resultA)) {
+			$count = 1;
+			if($cat['parentcatid'] = -1) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $countA WHERE catid = $cat[catid]");
+				$countA++;
+			}
+			$selectB = "SELECT category, catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '$cat[catid]' ORDER BY displayorder";
+			$resultB = dbquery($selectB);
+			while($sub = dbassoc($resultB)) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $count WHERE catid = $sub[catid]");
+				$count++;
+			}
+		}
+		$showlist = false;
+		$output .= write_message(_ACTIONSUCCESSFUL."<br /><br />"."<a href='admin.php?action=categories'>"._CONTINUE."</a>");
+	}
+	else {
+		if(isset($_GET["go"])) {
+			$displayorder = $_GET["displayorder"];
+			$oneabove =  ($_GET["go"] == "up" ?  $displayorder -1 : $displayorder + 1);
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = '-1' WHERE displayorder = '$displayorder' AND parentcatid = '".$_GET['parentcatid']."'");
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = '$displayorder' WHERE displayorder = '$oneabove' AND parentcatid = '".$_GET['parentcatid']."'");
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = '$oneabove' WHERE displayorder = '-1' AND parentcatid = '".$_GET['parentcatid']."'");
+			$catlist = array( );
+			$catresults = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_categories ORDER BY leveldown, displayorder");
+			while($cat = dbassoc($catresults)) {
+				$catlist[$cat['catid']] = array("name" => stripslashes($cat['category']), "pid" => $cat['parentcatid'], "order" => $cat['displayorder'], "locked" => $cat['locked'], "leveldown" => $cat['leveldown']);
+			}
+		}
+
+		if(isset($_GET["cat"])) {
+			$subof = isset($_GET['subof']) ? $_GET['subof'] : -1;
+			$after = isset($_GET['after']) ? $_GET['after'] : false;
+			$cat = isset($_GET['cat']) ? $_GET['cat'] : "new";
+			$new = isNumber($cat) ? false : true;
+			if(isNumber($cat)) {
+				$query = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_categories WHERE catid='$cat' LIMIT 1");
+				$cat1 = dbassoc($query);
+				$subof  = $cat1['parentcatid'];
+				$after = $cat1['displayorder'] -1;
+			}
+			$showlist = 0;	
+			$output .= "<div style='width: 100%;'><div  id=\"settingsform\"><form method='POST' enctype='multipart/form-data' name='form' action='admin.php?action=categories".($cat ? "&cat=$cat" : "")."'>
+				<div class='sectionheader'>".(!$new ? _EDITCAT : _NEWCAT)."</div>
+				<div><label for='parentcatid'>"._CATLEVEL.": </label>
+				<select name='parentcatid' id='parentcatid' onchange=\"setCategoryForm(this);\"><option value='-1'>"._TOPLEVEL."</option>";
+			if(count($catlist) > 0) {
+				$opt2 = "";
+				foreach($catlist as $c=> $cinfo) {
+					if($subof == $cinfo['pid'] || $subof == $c) 
+						$output .= "<option value='$c'".($subof == $c ? " selected" : "").">".$cinfo['name']."</option>";
+					if($subof == $cinfo['pid'] || (!$subof && $cinfo['pid'] == -1))
+						$opt2 .= "<option value='".$cinfo['order']."'".($after == $cinfo['order'] ? " selected" : "").">".$cinfo['name']."</option>";
+				}
+			}
+			$output .= "</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATLEVEL."</span></A></div>";
+			$output .= "<div><label for='orderafter'>"._ORDERAFTER.":</label> 
+					<select name='orderafter' id='orderafter'>";
+			$output .= "<option value='0'>"._MOVETOP."</option>".(isset($opt2) ? $opt2 : "")."</select> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_ORDERAFTER."</span></A></div>
+				<div><label for='category'>"._CATNAME.": </label>
+				<INPUT  type='text' class='textbox=' name='category'".($new ? ">" : "value='$cat1[category]'><input type='hidden' name='catid' value='$cat1[catid]'>")." <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATNAME."</span></A></div>
+				<div><label for='description'>"._DESC.": </label><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATDESC."</span></A>
+				<div style='margin-left: 30%; padding-left: 1em;'><textarea class='textbox' id='description' name='description' id='description' cols='35' rows='4'>".(!$new ? $cat1['description'] : "")."</textarea></div>";
+			if($tinyMCE) 
+				$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('description');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+			
+			$output.= "</div>
+				<div><label for='locked'>"._LOCKED.": </label>
+				<INPUT type='checkbox' class='checkbox' name='locked'".(!$new && $cat1['locked'] == 1 ? "checked" : "")."> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_LOCKED."</span></A></div>
+				<div><label for='image'>"._IMAGE.": </label>
+				<INPUT  type='text' class='textbox='  name='image'".(!$new && $cat1['image'] != "" ? "value='$cat1[image]'": "")."> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATIMAGE."</span></A></div>
+				<INPUT type='submit' class='button' id='submit' value='"._SUBMIT."' name='submit'>
+				</form></div><div style='clear: both;'>&nbsp;</div></div>";
+		}
+	}
+
+	if($showlist) {
+		// Rebuild the category list to reflect any changes we just did.
+			$catlist = array( );
+			$catresults = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_categories ORDER BY leveldown, displayorder");
+			while($cat = dbassoc($catresults)) {
+				$catlist[$cat['catid']] = array("name" => stripslashes($cat['category']), "pid" => $cat['parentcatid'], "order" => $cat['displayorder'], "locked" => $cat['locked'], "leveldown" => $cat['leveldown']);
+			}
+		$output .= "
+<table class=\"tblborder\" align=\"center\" cellspacing=\"0\" cellpadding=\"3\" style='margin: 0 auto;' width=\"90%\">
+		<tr><th class=\"tblborder\"><b>"._CATEGORY."</b></th><th class=\"tblborder\" colspan=\"2\"><b>"._MOVE."</b></th><th class=\"tblborder\"><b>"._OPTIONS."</b></th></tr>";
+		foreach($catlist as $cat => $catinfo) {
+				if($catinfo['pid'] == -1) $output .= build_cat_row($cat, $catinfo);
+		}
+		$output .= "<tr><td class=\"tblborder\" colspan=\"4\" align=\"center\"><a href=\"admin.php?action=categories&cat=new\">"._NEWMAIN."</a></td></tr></table>";
+	}	
+
+?>

--- /dev/null
+++ b/admin/censor.php
@@ -1,1 +1,47 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+	$output .= "<div id=\"pagetitle\">"._CENSOR."</div>";
+	if(isset($_POST['submit'])) {
+		if($_POST["words"]) {
+			$wordlist = explode(",", trim(strip_tags($_POST['words'])));
+			foreach($wordlist as $word) {
+				$word = trim($word);
+				if(strlen($word) > 0) $newwords[] = $word;
+			}
+		}
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET words = '".(is_array($newwords) ? implode(", ", $newwords) : "")."' WHERE sitekey = '".SITEKEY."'");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else {
+		if(is_array($words)) $wordlist = implode(", ", $words);
+		else $wordlist = "";
+		$output .= "<div style=\"text-align: center; margin: 1em; \">"._CENSORDIRS."</div>";
+		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=censor\" style=\"width: 500px; margin: 0 auto;\">
+			<textarea name=\"words\" rows=\"7\" cols=\"60\">$wordlist</textarea><br /><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form>";
+	}
+
+?>

--- /dev/null
+++ b/admin/characters.php
@@ -1,1 +1,147 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+	$output .= "<div id='pagetitle'>"._CHARACTERS."</div>";
+	if(isset($_GET["delete"])) {
+		$charid = $_GET["delete"];
+		$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+		if($confirm == "yes" && isNumber($charid))
+		{
+			$result5 = dbquery("SELECT catid, charname FROM ".TABLEPREFIX."fanfiction_characters WHERE charid = '$charid'");
+			$chars = dbassoc($result5);
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_characters where charid = '$charid'");
+			$storyquery = dbquery("SELECT charid, sid FROM ".TABLEPREFIX."fanfiction_stories WHERE FIND_IN_SET('$charid', charid) > 0");
+			while($story = dbassoc($storyquery)) {
+				$newcharlist = array_diff(explode(",", $story['charid']), array($charid));
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET charid = '".($newcharlist ? implode(",", $newcharlist) : "")."' WHERE sid = '$story[sid]'");
+			}
+			$seriesquery = dbquery("SELECT characters, seriesid FROM ".TABLEPREFIX."fanfiction_series WHERE FIND_IN_SET('$charid', characters) > 0");
+			while($series = dbassoc($seriesquery)) {
+				$newcharlist = array_diff(explode(",", $series['characters']), array($charid));
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_series SET characters = '".($newcharlist ? implode(",", $newcharlist) : "")."' WHERE seriesid = '$series[seriesid]'");
+			}
+			$code = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'delchar'");
+			while($c = dbassoc($code)) {
+				eval($c['code_text']);
+			}
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm  == "no") 	{
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_CONFIRMDELETE."<br /><br />
+				[ <a href=\"admin.php?action=characters&amp;delete=$charid&amp;confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=characters&amp;delete=$charid&amp;confirm=no\">"._NO."</a> ]");
+		}
+	}		
+	if(isset($_GET['do']) && $_GET['do'] == "addform") {
+		if(isset($_GET['charid']) && isNumber($_GET['charid'])) $charid = $_GET['charid'];
+		if(isset($_POST['numchars']) &&  isNumber($_POST['numchars'])) $numchars = $_POST['numchars'];
+		if(!isset($numchars)) $numchars = $itemsperpage;
+		if(isset($charid)) {
+			$charquery = dbquery("SELECT charname, bio FROM ".TABLEPREFIX."fanfiction_characters WHERE charid = '$charid' LIMIT 1");
+			$charinfo = dbassoc($charquery);
+			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" id='settingsform' action=\"admin.php?action=characters&do=update\">
+				<input type=\"hidden\" name=\"charid\" value=\"$charid\">";
+			$numchars = 1;
+		}
+		else if(isset($_GET['catid'])) {
+			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" id='settingsform' action=\"admin.php?action=characters&do=add\"><input type=\"hidden\" name=\"numchars\" value=\"$numchars\"><input type=\"hidden\" name=\"catid\" value=\"".$_GET['catid']."\">";
+		}
+		else {
+			$output .= "<div style='width: 100%;'><div  id=\"settingsform\"><form method=\"POST\" enctype=\"multipart/form-data\" id='settingsform'  action=\"admin.php?action=characters&do=add\"><input type=\"hidden\" name=\"numchars\" value=\"$numchars\"><input type=\"hidden\" name=\"catid\" value=\"".$_POST['catid']."\">";
+		}
+		for($x = 1; $x <= $numchars; $x++) {
+			$output .= "<div class='sectionheader'>".(isset($charid) ? _EDITCHAR : _NEWCHAR." $x")."</div>
+				<div><label for='character$x'>"._CHARACTER.":</label><input type=\"text\" class=\"textbox\" name=\"character$x\" size=\"35\"".(isset($charinfo['charname']) ? " value=\"".$charinfo['charname']."\"" : "")."> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CHARS."</span></A></div>
+				<div><label for='bio$x'>"._DESC.":</label><textarea class=\"textbox\" rows=\"6\" cols=\"40\" id= 'bio$x' name=\"bio$x\">".(isset($charinfo) ? $charinfo['bio'] : "")."</textarea></div>";
+			if($tinyMCE) 
+				$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('bio$x');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";	
+		}
+		$output .= "<div id='submitdiv'><INPUT type=\"submit\" id=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form></div><div style='clear: both;'>";
+		unset($_POST['submit']);
+	}
+	if(isset($_POST["submit"])) {
+		if($_GET["do"] == "add") {
+			$numchars = $_POST["numchars"];
+			if(!isNumber($numchars)) $numchars = $itempsperpage;
+			for($x = 1; $x <= $numchars; $x++) {
+				if(isset($_POST["character$x"]) && $_POST["character$x"] != "") {
+					$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_characters (charname, bio, catid) VALUES('".escapestring(descript(strip_tags(trim($_POST["character$x"]))))."', '".escapestring(descript($_POST["bio$x"]))."', '$_POST[catid]')");
+				}
+			}
+		}
+		else if($_GET["do"] == "update") {
+			$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_characters SET charname = '".escapestring(descript(strip_tags(trim($_POST["character1"]))))."', bio = '".escapestring(descript($_POST["bio1"]))."' WHERE charid = '$_POST[charid]'");
+		}
+		$output .= write_message(_ACTIONSUCCESSFUL);
+	}
+	if(!isset($_GET['do']) || isset($_POST['submit'])) {
+		if(isset($_GET['cat']) && isNumber($_GET['cat'])) $cat =  $_GET['cat'];
+		else $cat = -1;
+	
+		$output .= "<div style='text-align: center;'><form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"admin.php?action=characters&do=addform\">
+			<label for='catid'>"._CATEGORY.": </label>
+			<select name=\"catid\" onChange='document.location = document.location.pathname + \"?action=characters&cat=\"+ document.form.catid.options[document.form.catid.selectedIndex].value;'>
+			<option value=\"-1\">"._BACK2CATS."</option><option value=\"-1\"".($cat == "-1" ? " selected" : "").">"._SITEWIDE."</option>";
+		foreach($catlist as $category => $info){
+			if($category == $cat || $info['pid'] == $cat) $output .= "<option value=\"$category\"".($category == $cat ? " selected" : "").">".$info['name']."</option>";
+		}
+		$output .= "</select></form></div>";
+
+		// Repopulate the characters list to reflect any changes we made.
+		$charlist = array( );
+		$result = dbquery("SELECT charname, catid, charid FROM ".TABLEPREFIX."fanfiction_characters ORDER BY charname");
+		while($char = dbassoc($result)) {
+			$charlist[$char['charid']] = array("name" => stripslashes($char['charname']), "catid" => $char['catid']);
+		}
+
+		//List of current characters
+		$output .= "<center>"._CHOOSECATNOTE."</center><br /><table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" style='margin: 0 auto;' align=\"center\">
+		<tr>
+		<th class=\"tblborder\">"._CHARACTER."</th><th class=\"tblborder\">"._OPTIONS."</th>
+		</tr>";
+		$count = 0;
+		foreach($charlist as $char =>$charinfo) {
+			if($charinfo['catid'] == $cat) {
+				$output .= "<tr><td class=\"tblborder\">
+				<a href=\"browse.php?type=characters&amp;charid=$char\">".$charinfo['name']."</a></td><td class=\"tblborder\"><a href=\"admin.php?action=characters&amp;do=addform&amp;charid=$char&amp;cat=$cat\">"._EDIT."</a> | <a href=\"admin.php?action=characters&amp;delete=$char&amp;cat=$cat\">"._DELETE."</a></td></tr>";
+				$count++;
+			}
+		}	
+		if($count == 0) $output .= "<tr><td class=\"tblborder\" colspan=\"2\" style=\"text-align: center;\">"._NORESULTS."</td></tr>";
+		$output .= "</table></p>";
+		$output .= "<div class='sectionheader'>"._ADDNEWCHARS."</div>
+		<div><form method=\"POST\" name=\"addform\" enctype=\"multipart/form-data\" id='settingsform' action=\"admin.php?action=characters&do=addform&catid=$cat\">
+		<div><label for='numchars'>"._NUMCHARS.":</label><select name=\"numchars\">";
+		for($x = 1; $x < $itemsperpage + 1; $x++) {
+			$output .= "<option value=\"$x\">$x</option>";
+		}
+		$output .= "</select><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_NUMCHARS."</span></A></div><div id='submitdiv'><INPUT type=\"submit\" class=\"button\" id='submit' value=\""._SUBMIT."\" name=\"submit\"></div>
+			</form><div style='clear: both;'>&nbsp;</div></div>";
+	}
+?>

--- /dev/null
+++ b/admin/classifications.php
@@ -1,1 +1,168 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+
+$list = true;
+
+if(isset($_GET['type_id']) && isNumber($_GET['type_id'])) $type_id = $_GET['type_id'];
+if(isset($_GET['listtype']) && isNumber($_GET['listtype'])) $listtype = $_GET['listtype'];
+
+if(isset($_GET['delete'])) {
+	if($_GET['delete'] == "class" && isNumber($_GET["class"])) $thislist = dbquery("SELECT class_id FROM ".TABLEPREFIX."fanfiction_classes WHERE class_id = '".$_GET["class"]."'");
+	else {
+		list($classname) = dbrow(dbquery("SELECT classtype_name FROM ".TABLEPREFIX."fanfiction_classtypes WHERE classtype_id = '$type_id'"));
+		dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_pagelinks WHERE link_name = '".$classname."_link' LIMIT 1");
+		$thislist = dbquery("SELECT class_id FROM ".TABLEPREFIX."fanfiction_classes WHERE class_type = '$type_id'");
+		dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_classtypes WHERE classtype_id = '$type_id'");
+	}
+	while($thisclass = dbassoc($thislist)) {
+		$class = $thisclass['class_id'];
+		$stories = dbquery("SELECT sid, classes FROM ".TABLEPREFIX."fanfiction_stories WHERE FIND_IN_SET('$class', classes) > 0");
+		while($s = dbassoc($stories)) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET classes = '".implode(",", array_diff(explode(",", $s['classes']), array($class)))."' WHERE sid = '$s[sid]' LIMIT 1");
+		}
+		$series = dbquery("SELECT seriesid, classes FROM ".TABLEPREFIX."fanfiction_series WHERE FIND_IN_SET('$class', classes) > 0");
+		while($s = dbassoc($series)) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_series SET classes = '".implode(",", array_diff(explode(",", $s['classes']), array($class)))."' WHERE seriesid = '$s[seriesid]' LIMIT 1");
+		}
+		$code = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'delclass'");
+		while($c = dbassoc($code)) {
+			eval($c['code_text']);
+		}
+		dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_classes WHERE class_id = '$class' LIMIT 1");
+	}
+}
+if(isset($_GET['newitems']) && isNumber($_GET['newitems'])) {
+	if(isset($_POST['submit'])) {
+		for($x = 1; $x <= $itemsperpage; $x++) {
+			$item = escapestring(descript(strip_tags($_POST["item_$x"])));
+			if($item) {
+				$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_classes(`class_type`, `class_name`) VALUES('$_GET[newitems]', '$item')");
+				if(!$result) $output .= write_error(magicunquote($item).": "._ERROR."<br />");
+			}
+		}
+		$listtype = $_GET['newitems'];
+	}
+	else {
+		$type = dbquery("SELECT classtype_title FROM ".TABLEPREFIX."fanfiction_classtypes WHERE classtype_id = '$_GET[newitems]' LIMIT 1");
+		list($thistype) = dbrow($type);
+		$output .= "<div id=\"pagetitle\">$thistype</div><div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" style=\"width: 450px; margin: 1em auto;\" action=\"admin.php?action=classifications&amp;newitems=$_GET[newitems]\">\n";
+		for($x = 1; $x <= $itemsperpage; $x ++) {
+			$output .=  "<div><label for=\"item_$x\">"._NEWITEM." $x: </label><input type=\"text\" class=\"textbox\" size='30' name=\"item_$x\"></div>\n";
+		}
+		$output .= "<div style='text-align: center; margin: 1em auto;'><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></div></div>";
+		$list = false;
+	}
+}
+if(isset($listtype)) {
+	$thislist = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_classes WHERE class_type = '$listtype'");
+	$output .= "<table class=\"tblborder\" style=\"margin: 0 auto;\"><tr><th clas=\"tblborder\">"._CLASS."</th><th clas=\"tblborder\">"._OPTIONS."</th></tr>";
+	if(!dbnumrows($thislist)) $output .= "<tr><td class=\"tblborder\" colspan='2'>"._NORESULTS."</td></tr>";
+	while($class = dbassoc($thislist)) {
+		$output .= "<tr>
+			<td class=\"tblborder\">
+				$class[class_name]
+			</td>
+			<td class=\"tblborder\">
+				<a href=\"admin.php?action=classifications&amp;class=$class[class_id]\">"._EDIT."</a> |
+				<a href=\"admin.php?action=classifications&amp;delete=class&amp;class=$class[class_id]&amp;listtype=$listtype\">"._DELETE."</a>
+			</td></tr>";
+	}	
+	$output .= "<tr><td class=\"tblborder\" colspan=\"2\" style=\"text-align: center;\"><a href=\"admin.php?action=classifications&newitems=$listtype\">"._ADDNEWCLASSES."</a></td></tr></table>";
+	$list = false;
+}
+if(isset($_GET['type']) && empty($_GET['delete'])) {
+	if(isset($_POST['submit'])) {
+		$type_name = escapestring(descript(strip_tags($_POST['type_name'])));
+		$type_title = escapestring(descript(strip_tags($_POST['type_title'])));
+		if(isset($_POST['type_id'])) $result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_classtypes SET classtype_name = '$type_name', classtype_title = '$type_title' WHERE classtype_id = '".$_POST['type_id']."' LIMIT 1");
+		else {
+			$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_classtypes(classtype_name, classtype_title) VALUES('$type_name', '$type_title')");
+			$id = dbinsertid($result);
+			$result2 = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_pagelinks(link_name, link_text, link_url) VALUES('".$type_name."_link', '$type_title', 'browse.php?type=class&amp;type_id=$id')");
+		}
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else {
+		if(isNumber($_GET['type'])) {
+			$typequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_classtypes WHERE classtype_id = '$_GET[type]' LIMIT 1");
+			$thistype = dbassoc($typequery);
+		}
+		$output .= "<div id='settingsform'><form method=\"POST\" style=\"width: 100%; margin: 1em auto;\" enctype=\"multipart/form-data\" action=\"admin.php?action=classifications&amp;type=$_GET[type]\">";
+		if(isset($thistype)) $output .= "<input type=\"hidden\" name=\"type_id\" value=\"".$thistype['classtype_id']."\">";
+		$output .= "<div><label for=\"type_name\">"._NAME.": </label> <input type=\"text\" class=\"textbox\" name=\"type_name\" value=\"".(isset($thistype) ? $thistype['classtype_name'] : "")."\"></div>
+			<div><label for=\"type_name\">"._TITLE.": </label> <input type=\"text\" class=\"textbox\" name=\"type_title\" value=\"".(isset($thistype) ? $thistype['classtype_title'] : "")."\"></div>
+			<div style='text-align: center; margin: 1em auto;'><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form></div>";
+		$output .= write_message(_CLASSNOTE);
+		$list = false;
+	}
+}
+if(isset($_GET['class']) && empty($_GET['delete'])) {
+	if(isset($_POST['submit'])) {
+		if(isset($_GET['class']) && isNumber($_GET['class'])) $class_id = $_GET['class'];
+		$class_name = escapestring(descript(strip_tags($_POST['class_name'])));
+		$class_type = isNumber($_POST['type_id']) ? $_POST['type_id'] : false;
+		if(isset($class_id)) $result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_classes SET class_name = '$class_name', class_type = '$class_type' WHERE class_id = '$class_id' LIMIT 1");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else {
+		if(isNumber($_GET['class'])) {
+			$typequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_classes WHERE class_id = '$_GET[class]' LIMIT 1");
+			$thisclass = dbassoc($typequery);
+		}
+		$output .= "<div id='settingsform'><form method=\"POST\" style=\"width: 90%; margin: 1em auto;\" enctype=\"multipart/form-data\" action=\"admin.php?action=classifications&amp;class=$_GET[class]\">";
+		if(isset($thisclass)) $output .= "<div><label for=\"class_name\">"._NAME.": </label> <input type=\"text\" class=\"textbox\" name=\"class_name\" value=\"".(isset($thisclass) ? $thisclass['class_name'] : "")."\"></div>
+			<div><label for=\"type_id\">"._CLASSTYPES.":</label> <select name=\"type_id\" id=\"type_id\">";
+		$types = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_classtypes");
+		while($t = dbassoc($types)) {
+			$output .= "<option value='".$t['classtype_id']."'".($t['classtype_id'] == $thisclass['class_type'] ? " selected" : "").">".$t['classtype_title']."</option>";
+		}
+		$output .= "</select></div>
+			<div id='submitdiv'><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form><div class='cleaner'>&nbsp;</div></div>";
+		$output .= write_message(_CLASSNOTE);
+		$list = false;
+	}
+}
+if($list) {
+	$types = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_classtypes");
+	$output .= "<div style='text-align: center;'><table class=\"tblborder\" style=\"margin: 0 auto; text-align: left;\"><tr><th clas=\"tblborder\">"._CLASSTYPES."</th><th clas=\"tblborder\">"._OPTIONS."</th></tr>";
+	if(!dbnumrows($types)) $output .= "<tr><td class=\"tblborder\" colspan='2'>"._NORESULTS."</td></tr>";
+	while($type = dbassoc($types)) {
+		$output .= "<tr>
+			<td class=\"tblborder\">
+				<a href=\"admin.php?action=classifications&amp;listtype=$type[classtype_id]\">$type[classtype_title]</a>
+			</td>
+			<td class=\"tblborder\">
+				<a href=\"admin.php?action=classifications&amp;type=$type[classtype_id]\">"._EDIT."</a> |
+				<a href=\"admin.php?action=classifications&amp;delete=type&amp;type_id=$type[classtype_id]\">"._DELETE."</a>
+			</td></tr>";
+	}	
+	$output .= "<tr><td class=\"tblborder\" colspan=\"2\" style=\"text-align: center;\"><a href=\"admin.php?action=classifications&type=new\">"._ADDNEWCLASSTYPE."</a></td></tr></table></div>";
+	$output .= write_message(_CLASSLISTNOTE);
+}
+?>

--- /dev/null
+++ b/admin/custpages.php
@@ -1,1 +1,105 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+
+	$output .= "<div id=\"pagetitle\">"._CUSTPAGES."</div>";
+if(isset($_GET['delete']) && isNumber($_GET['delete'])) {
+	$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_messages WHERE message_id = ".$_GET['delete']." LIMIT 1");
+	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+	else $output .= write_error(_ERROR);
+}
+if(isset($_POST['submit'])) {
+	if(!preg_match("!^[a-z0-9_]{3,30}$!i", $_POST['name'])) $output .= write_error(_BADVARNAME);
+	else {
+		$pagename = descript($_POST['name']);
+		$pagetitle = descript($_POST['title']);
+		if(isset($_GET['edit']) && isNumber($_GET['edit'])) 
+			$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_messages SET message_name = '".escapestring($pagename)."', message_title = '".escapestring($pagetitle)."', message_text = '".escapestring(descript($_POST['text']))."' WHERE message_id = ".$_GET['edit']." LIMIT 1");
+		else {
+			$result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_messages(`message_name`, `message_title`, `message_text`) VALUES( '".escapestring($pagename)."', '".escapestring($pagetitle)."', '".escapestring(descript($_POST['text']))."')");
+			if($result) $result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_pagelinks(`link_name`, `link_text`, `link_url`, `link_target`, `link_access`) VALUES('".escapestring($pagename)."_link', '".escapestring($pagetitle)."', 'viewpage.php?page=$pagename', '0', '0')");
+		}
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL."<br /><br /><a href='viewpage.php?page=$pagename'>$pagetitle</a>");
+		else $output .= write_error(_ERROR);
+		unset($_GET['edit']);
+	}
+}
+if((isset($_GET['edit']) && isNumber($_GET['edit'])) || isset($_GET["new"]) || isset($_POST['preview'])) {
+	unset($message, $id, $name, $title, $text);
+	if(isset($_POST['preview'])) {
+		$name = descript($_POST['name']);
+		$title = descript($_POST['title']);
+		$thistext = descript($_POST['text']);
+		$edit = isset($_GET['edit']) ? $_GET['edit'] : "";
+		if(strpos($thistext, "?>") === false) $output .= "<div id='pagetitle'>$title</div>\n\n$thistext";
+		else {
+			$text = "";
+			eval("?>".$thistext."<?php ");
+			$output .= "<div id='pagetitle'>$title</div>\n\n$text";
+		}
+		$text = $thistext;
+	}
+	else if(isset($_GET['edit'])) {
+		$edit = $_GET['edit'];
+		$pagequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_messages WHERE message_id = $edit LIMIT 1");
+		$message =  dbassoc($pagequery);
+		$id = $message['message_id'];
+		$name = $message['message_name'];
+		$title = $message['message_title'];
+		$text = $message['message_text'];
+	}
+	else {
+		$name = "";
+		$title = "";
+		$text = "";
+	}
+	$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=custpages".(isset($edit) ? "&amp;edit=$edit" : "")."\">
+		<div><label for=\"name\">"._NAME.":</label> <input type=\"text\" class=\"textbox\" name=\"name\" value=\"$name\"></div>
+		<div><label for=\"title\">"._TITLE.":</label> <input type=\"text\" class=\"textbox\" name=\"title\" value=\"$title\" size=\"30\"></div>
+		<div><label for=\"text\">"._TEXT.":</label><br />
+		<textarea class=\"textbox\" rows=\"10\" cols=\"60\" style='width: 100%;' name=\"text\">$text</textarea>";
+	if($tinyMCE) 
+		$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('text');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+	$output .= "</div><INPUT type=\"submit\" class=\"button\" name=\"preview\" id=\"preview\" value=\""._PREVIEW."\"><INPUT type=\"submit\" class=\"button\" name=\"submit\" id=\"submit\" value=\""._SUBMIT."\"></form></div>";
+	$output .= write_message(_CUSTPAGENOTE);
+}
+else {
+	$listquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_messages");
+	$output .= "<table class=\"tblborder\" style=\"margin: 0 auto;\"><tr><th class=\"tblborder\">"._ID."</th><th class=\"tblborder\">"._NAME."</th><th class=\"tblborder\">"._TITLE."</th><th class=\"tblborder\">"._OPTIONS."</th></tr>";
+	while($msg = dbassoc($listquery)) {
+		// Hidden messages they're listed in the settings.
+		if($msg['message_name'] == "welcome" ||  $msg['message_name'] == "nothankyou" || $msg['message_name'] == "thankyou" ||
+		$msg['message_name'] == "copyright" || $msg['message_name'] == "printercopyright") continue;
+		$output .= "<tr><td class=\"tblborder\">$msg[message_id]</td><td class=\"tblborder\">$msg[message_name]</td><td class=\"tblborder\"><a href='viewpage.php?page=$msg[message_name]'>$msg[message_title]</a></td>
+		<td class=\"tblborder\"><a href=\"admin.php?action=custpages&amp;edit=$msg[message_id]\">"._EDIT."</a> | 
+		<a href=\"admin.php?action=custpages&amp;delete=$msg[message_id]\">"._DELETE."</a></td></tr>";
+	}
+	if(!dbnumrows($listquery)) $output .= "<tr><td class=\"tblborder\" colspan=\"3\" align=\"center\">"._NORESULTS."</td></tr>";
+	$output .= "<tr><td class=\"tblborder\" colspan=\"4\" align=\"center\"><a href=\"admin.php?action=custpages&amp;new=1\">"._ADDCUSTPAGE."</a></td></tr>";
+	$output .= "</table>";
+	$output .= write_message(_CUSTPAGENOTE);
+}
+?>

--- /dev/null
+++ b/admin/featured.php
@@ -1,1 +1,45 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+	if(isset($_GET['retire']) && preg_match("/^[0-9]+$/", $_GET['retire']))
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 2 WHERE sid = ".$_GET['retire']);
+	if(isset($_GET['remove']) && preg_match("/^[0-9]+$/", $_GET['remove']))
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 0 WHERE sid = ".$_GET['remove']);
+	if(isset($_GET['feature']))
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);
+	$fresult = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = "._UIDFIELD." ORDER BY stories.featured");
+	$output .= "<div id='pagetitle'>"._FEATUREDSTORIES."</div>";
+	if(!dbnumrows($fresult)) $output .= write_message(_NORESULTS);
+	else {
+		$output .= "<table class=\"tblborder\" cellpadding=\"5\" style=\"margin: 1em auto;\"><tr><th class=\"tblborder\">"._STORIES."</th><th class=\"tblborder\">"._STATUS."</th><th class=\"tblborder\">"._OPTIONS."</th></tr>";
+		while($story = dbassoc($fresult)) {
+			$output .= "<tr><td class=\"tblborder\"><a href=\"viewstory.php?sid=$story[sid]\">$story[title]</a> "._BY." <a href=\"viewuser.php?uid=$story[uid]\">$story[penname]</a></td><td class=\"tblborder\" align=\"center\">".($story['featured'] == 1 ? _ACTIVE : _RETIRED)."</td><td class=\"tblborder\" align=\"center\">".($story['featured'] == 1 ? "<a href=\"admin.php?action=featured&retire=$story[sid]\">"._RETIRE."</a>" : "<a href=\"admin.php?action=featured&feature=$story[sid]\">"._CURRENT."</a>")." | <a href=\"admin.php?action=featured&remove=$story[sid]\">"._REMOVE."</a></td></tr>";
+		}
+		$output .= "</table>";
+		$output .= write_message(_FEATUREDNOTE);
+	}
+?>

--- /dev/null
+++ b/admin/genres.php
@@ -1,1 +1,104 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+function genres( ) {
+	global $allowed_tags;
+
+	$output .= "<center><h4>"._GENRES."</h4></center>";
+	if($_GET["delete"]) {
+		$gid = $_GET["delete"];
+		if($_GET["confirm"] == "yes")
+		{
+			$result5 = dbquery("SELECT genre FROM ".TABLEPREFIX."fanfiction_genres WHERE gid = '$gid'") or die(_FATALERROR."Query: SELECT genre FROM ".TABLEPREFIX."fanfiction_genres WHERE gid = '$gid'<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+			$genres = dbassoc($result5);
+			$newquery5 = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_stories WHERE gid LIKE '%$genres[genre]%'") or die(_FATALERROR."Query: SELECT * FROM ".TABLEPREFIX."fanfiction_stories WHERE gid LIKE '%$genres[genre]%'<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+				while($genreresult = dbassoc($newquery5))
+				{
+					$tok = strtok($genreresult[gid], ", ");// tokenize the old list of names
+					$newString = "";// the new list of good names
+					while($tok)
+					{
+						if( $tok != $genres[genre] )// oldname is the thing that is going away
+						{
+							// It's a keeper, so decide if it is first or not for comma-age, then add it in
+							if( $newString != "" )
+								$newString .= ", ";
+							$newString .= $tok;
+						}
+						$tok = strtok(", "); //advance to the next token
+					}
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET gid = '$newString' WHERE sid = '$genreresult[sid]'")  or die(_FATALERROR."Query: UPDATE ".TABLEPREFIX."fanfiction_stories SET gid = '$newString' WHERE sid = '$genreresult[sid]'<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+				}
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_genres where gid = '$gid'") or die(_FATALERROR."Query: DELETE FROM ".TABLEPREFIX."fanfiction_genres where gid = '$gid'<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+		}
+		else if ($_GET["confirm"] == "no")
+		{
+			$output .= "<center>"._ACTIONCANCELLED."</center>";
+		}
+		else
+		{
+			$output .= "<center>"._CONFIRMDELETE."<br /><br />";
+			$output .= "[ <a href=\"admin.php?action=genres&amp;delete=$gid&amp;confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=genres&delete=$gid&confirm=no\">"._NO."</a> ]</center>";
+			return $output;
+		}
+	}
+	if ($_POST[submit]) {
+		if($_GET[genre] == "new") dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_genres (genre) VALUES ('".addslashes(stripinput(strip_tags($_POST[genre])))."')") or die(_FATALERROR."<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+		else dbquery("UPDATE ".TABLEPREFIX."fanfiction_genres set genre = '".addslashes(stripinput(strip_tags($_POST[genre])))."' WHERE gid = '$_GET[genre]'") or die(_FATALERROR."<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+	}
+	else {
+		if(isset($_GET[genre])) {
+			if($_GET[genre] != "new") {
+				$genrequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_genres WHERE gid = '$_GET[genre]' LIMIT 1") or die(_FATALERROR."<br />Error: (".mysql_errno( ).") ".mysql_error( ));
+				$genre = dbassoc($genrequery);
+			}
+			$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=genres&genre=$_GET[genre]\">
+			<table align=\"center\"><tr><td colspan=\"2\" align=\"center\"><b>".($_GET[genre] == "new" ? _NEWGENRE : _EDITGENRE)."</b></td></tr>
+			<tr><td>"._GENRE.": <A HREF=\"javascript:pop('docs/adminhints.htm#genres');\">[?]</A></td>
+			<td><INPUT type=\"text\" class=\"textbox=\"  name=\"genre\"".($_GET[genre] != "new" ? "value=\"$genre[genre]\"" : "")."></td></tr>
+			<tr><td colspan=\"2\" align=\"right\"><INPUT type=\"submit\" class=\"button\" value=\""._SUBMIT."\" name=\"submit\"></td></tr></table></form>";
+		}
+		else {
+
+			$result = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_genres");
+
+			//List of current genres
+
+			$output .= "<table class=\"tblborder\" cellpadding=\"3\" cellspacing=\"0\" align=\"center\">
+			<tr><th colspan=\"2\" align=\"center\">"._GENRES."</th></tr>
+			<tr><td colspan=\"2\" align=\"center\" class=\"tblborder\"><a href=\"admin.php?action=genres&genre=new\">"._ADDGENRE."</a></td></tr>";
+			while ($genreresults = dbassoc($result))
+			{
+				$output .= "<tr><td class=\"tblborder\">$genreresults[genre]";
+				$output .= "</td><td class=\"tblborder\"><a href=\"admin.php?action=genres&genre=$genreresults[gid]\">"._EDIT."</a> | <a href=\"admin.php?action=genres&delete=$genreresults[gid]\">"._DELETE."</td></tr>";
+			}
+			$output .= "</table>";
+
+		}
+	}
+	return $output;
+}
+// end genres function
+
+?>

--- /dev/null
+++ b/admin/index.php

--- /dev/null
+++ b/admin/links.php
@@ -1,1 +1,122 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+	$output .= "<div id=\"pagetitle\">"._LINKS."</div>";
+if(isset($_GET['delete']) && isNumber($_GET['delete'])) {
+	$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_pagelinks WHERE link_id = $_GET[delete] LIMIT 1");
+	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+	else $output .= write_error(_ERROR);
+}
+if(isset($_POST['submit'])) {
+	if(!preg_match("!^[a-z0-9_]{3,30}$!i", $_POST['link_name'])) $output .= write_error(_BADVARNAME);
+	else {
+		if(isNumber($_POST['link_access'])) $link_access = $_POST['link_access'];
+		else $link_access = 0;
+		$link_name = descript($_POST['link_name']);
+		$link_text = descript($_POST['link_text']);
+		$link_url = descript(strip_tags($_POST['link_url']));
+		$link_target = descript($_POST['link_target']);
+		$link_key = strlen($_POST['link_key']) > 1 ? substr($_POST['link_key'], 0, 1) : $_POST['link_key']; // only one letter please.
+		if(isset($_GET['edit']) && isNumber($_GET['edit'])) 
+			$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_pagelinks SET link_name = '".escapestring($link_name)."', link_text = '".escapestring($link_text)."', link_key = '$link_key', link_url = '".escapestring($link_url)."', link_target = '$link_target', link_access = '$link_access' WHERE link_id = $_GET[edit] LIMIT 1");
+		else $result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_pagelinks(`link_name`, `link_text`, `link_key`, `link_url`, `link_target`, `link_access`) VALUES('".escapestring($link_name)."', '".escapestring($link_text)."', '".escapestring($link_key)."', '".escapestring($link_url)."', '$link_target', '$link_access')");
+		if($result) {
+			$output .= write_message(_ACTIONSUCCESSFUL);
+			$linkquery = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_pagelinks ORDER BY link_access ASC");
+			if(!isset($current)) $current = "";
+
+			while($link = dbassoc($linkquery)) {
+				if($link['link_access'] && !isMEMBER) continue;
+				if($link['link_access'] == 2 && !isADMIN) continue;
+				$tpl->assignGlobal($link['link_name'], "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+				$pagelinks[$link['link_name']] = array("id" => $link['link_id'], "text" => $link['link_text'], "url" => _BASEDIR.$link['link_url'], "link" => "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+			}
+		}
+		else $output .= write_error(_ERROR);
+		unset($_GET['edit']);
+	}
+}
+if(isset($_GET['edit']) || isset($_GET["new"])) {
+	if(isset($_GET['edit'])) {
+		$pagequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_pagelinks WHERE link_id = ".$_GET['edit']." LIMIT 1");
+		$link =  dbassoc($pagequery);
+		$id = $link['link_id'];
+		$name = $link['link_name'];
+		$text = $link['link_text'];
+		$url = $link['link_url'];
+		$target = $link['link_target'];
+		$access = $link['link_access'];
+		$edit = $_GET['edit'];
+		$accesskey = $link['link_key'];
+	}
+	else {
+		$link = "";
+		$id = "";
+		$name = "";
+		$text = "";
+		$url = "";
+		$target = "";
+		$link = "";
+		$edit = "";
+		$access = 0;
+		$accesskey = "";
+	}
+	$output .= "<form method=\"POST\" id=\"settingsform\" enctype=\"multipart/form-data\" action=\"admin.php?action=links".($edit ? "&amp;edit=$edit" : "")."\">
+	<p><label for=\"link_name\">"._NAME.":</label> <input type=\"text\" class=\"textbox\" name=\"link_name\" value=\"$name\"> <br />
+	<label for=\"link_text\">"._LINKTEXT.":</label> <input type=\"text\" class=\"textbox\" name=\"link_text\" value=\"$text\"><br />
+	<label for=\"link_key\">"._LINKKEY.":</label> <input type=\"text\" class=\"textbox\" name=\"link_key\" value=\"$accesskey\" size=\"1\"><br />
+	<label for=\"link_url\">"._URL.":</label> <input type=\"text\" class=\"textbox\" name=\"link_url\" value=\"$url\"><br />
+	<label for=\"link_target\">"._TARGET.":</label> <select name=\"link_target\" class=\"textbox\">
+		<option value=\"0\"".($target ? "" : " selected").">"._SAMEWINDOW."</option>
+		<option value=\"1\"".($target ? " selected" : "").">"._NEWWINDOW."</option>
+	</select><br />
+	<label for=\"link_access\">"._LINKACCESS.":</label> <select name=\"link_access\" class=\"textbox\">
+		<option value=\"0\"".($access ? "" : " selected").">"._ALL."</option>
+		<option value=\"1\"".($access == 1 ? " selected" : "").">"._MEMBERS."</option>
+		<option value=\"2\"".($access == 2 ? " selected" : "").">"._ADMINS."</option>
+	</select><br />
+	<INPUT type=\"submit\" class=\"button\" name=\"submit\" id=\"submit\" value=\""._SUBMIT."\"></form>";
+	$output .= write_message(_NAMECONVENTIONS);
+}
+else {
+// Re-populate the list of links to reflect any changes we just made.
+$linkquery = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_pagelinks ORDER BY link_access ASC");
+if(!isset($current)) $current = "";
+unset($pagelinks);
+	$output .= "<table class=\"tblborder\" style=\"margin: 0 auto;\"><tr><th class=\"tblborder\">"._LINKS."</th><th class=\"tblborder\">"._OPTIONS."</th></tr>";
+while($link = dbassoc($linkquery)) {
+	if($link['link_access'] && !isMEMBER) continue;
+	if($link['link_access'] == 2 && !isADMIN) continue;
+	$tpl->assignGlobal($link['link_name'], "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+	$pagelinks[$link['link_name']] = array("id" => $link['link_id'], "text" => $link['link_text'], "url" => _BASEDIR.$link['link_url'], "link" => "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+	$output .= "<tr><td class=\"tblborder\"><a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").">".$link['link_text']."</a></td></td>
+		<td class=\"tblborder\"><a href=\"admin.php?action=links&amp;edit=".$link['link_id']."\">"._EDIT."</a> | 
+		<a href=\"admin.php?action=links&amp;delete=".$link['link_id']."\">"._DELETE."</a></td></tr>";
+}
+
+	if(!dbnumrows($linkquery)) $output .= "<tr><td class=\"tblborder\" colspan=\"2\" align=\"center\">"._NORESULTS."</td></tr>";
+	$output .= "<tr><td class=\"tblborder\" colspan=\"2\" align=\"center\"><a href=\"admin.php?action=links&amp;new=1\">"._ADDNEWLINK."</a></td></tr>";
+	$output .= "</table>";
+}
+?>

--- /dev/null
+++ b/admin/lock.php
@@ -1,1 +1,84 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+	if(uLEVEL > 1) accessDenied( );
+	$do = $_GET["do"];
+	if(isset($_GET["unlock"]) && isNumber($_GET['unlock'])) {
+		$output .= "<div id=\"pagetitle\">"._UNLOCK."</div>";
+		if($_GET["confirm"] == "yes")
+		{
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_authors SET level = '0' WHERE uid = '".$_GET['unlock']."'");
+			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+		}
+		else if ($_GET["confirm"] == "no")
+		{
+			$output .= "<center>"._ACTIONCANCELLED."</center>";
+		}
+		else
+		{
+			$output .= "<div id=\"pagetitle\">"._CONFIRMUNLOCK."</div>";
+			$output .= "<center>[ <a href=\"admin.php?action=lock&confirm=yes&unlock=".$_GET['unlock']."\">"._YES."</a> | <a href=\"admin.php?action=lock&confirm=no&unlock=".$_GET['unlock']."\">"._NO."</a> ]</center>";
+		}
+	
+	}
+
+	else if(isset($do)) {
+	
+		if($_POST['submit'] && isNumber($_POST['uid'])) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_authors SET level = '-1' WHERE uid = '".$_POST['uid']."'");
+			
+			$output .= "<center>"._BACK2ADMIN."</center>";
+			return $output;
+		}
+
+		$action = $_GET['action'];
+		if(isset($_GET["uid"])) $uid = $_GET["uid"];
+		else $uid = $_POST["uid"];
+		if(!isNumber($uid)) $uid = 0;
+		$output .= "<div id=\"pagetitle\">"._MEMLOCK."</div><form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"/admin.php?action=lock&do=$do\">";
+		$output .= "<table align=\"center\" width=\"250\" class=\"tblborder\"><tr><td><label for=\"uid\">"._PENNAME.": </label>";
+			$query = dbquery("SELECT penname, uid FROM ".TABLEPREFIX."fanfiction_authors WHERE level = '0' ORDER BY penname");
+			$output .= "<select name=\"uid\">";
+			while($users = dbassoc($query)) {
+				$output .= "<option value=\"".$users['uid']."\"".($_GET['uid'] == $users['uid'] ? " selected" : "").">".$users['penname']."</option>";
+			}	
+		
+			$output .= "</select></td></tr><tr align\"center\"><td colspan=\"2\">
+			<INPUT type=\"submit\" class=\"button\" value=\""._SUBMIT."\" name=\"submit\">
+			</form></td></tr></table>";	
+	}
+	
+	else {
+
+		if($let == _OTHER) $letter= _PENNAMEFIELD." REGEXP '^[^a-z]'";
+		else $letter .= _PENNAMEFIELD." LIKE '".$_GET['let']."%'";
+		$output .= "<div class='sectionheader'>"._MEMLOCK."</div>";
+		$pagelink = "<a href=\"admin.php?action=lock&let=";
+		$countquery = "SELECT count("._UIDFIELD.") FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE ap.level = -1";
+		$authorquery = "SELECT "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid, count(stories.uid) as stories FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_stories as stories ON ("._UIDFIELD." = stories.uid) AND "._UIDFIELD." > 0 AND stories.validated > 0 LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE ap.level = -1 GROUP BY "._UIDFIELD;
+		include("includes/members_list.php");
+
+	
+		$output .= "<div class=\"respond\"><a href=\"admin.php?action=lock&do=new\">"._LOCKNEW."</a></div>";
+	}
+
+?>

--- /dev/null
+++ b/admin/mailusers.php
@@ -1,1 +1,73 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+	include("includes/emailer.php");
+	$cat = isset($_GET['cat']) ? $_GET['cat'] : -1;
+
+	$output .= "<div style='text-align: center;'><h4>"._MAILUSERS."</h4></div>";
+	if(isset($_POST['submit'])) {
+		$who = isset($_POST['who']) ? $_POST['who'] : false;
+		$category = isset($_POST['category']) ? $_POST['category'] : false;
+		if($who == "authors") $select = "SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_authorprefs as ap WHERE "._UIDFIELD." = ap.uid AND ap.stories > 0";
+		else if($who == "admins") $select = "SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_authorprefs as ap WHERE "._UIDFIELD." = ap.uid AND ap.level > 0";
+		else $select = "SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE;
+		if($who == "admins" && $_POST['category'] != "all" && isNumber($_POST['category'])) $select .= " AND (FIND_IN_SET(".$_POST['category'].", ap.categories) > 0 OR ap.categories = 0)";
+		$query = dbquery($select);
+		$subject = strip_tags(descript($_POST['subject']));
+		$mailtext = descript($_POST['mailtext']);
+		$sent = 0;
+		while($result = dbassoc($query)){
+			$mailresult = sendemail($result['penname'], $result['email'], $sitename, $siteemail, $subject, $mailtext, "html");
+			if($mailresult) $sent++;
+			$output .= $result['penname']." <img src=\"images/".($mailresult ? "check.gif\" alt=\"check\" title=\"check\"" : "X.gif\" alt=\"X\" title=\"X\"")."><br />";		
+		}
+		if($sent) $output .= write_message(_MESSAGESENT." $sent<br/>"._ACTIONSUCCESSFUL);
+		else $output .= write_message(_NOMAILSENT);
+	}
+	else {
+		$output .= "<form method=\"POST\" name=\"form\" enctype=\"multipart/form-data\" action=\"admin.php?action=mailusers\">
+		<table align=\"center\"><tr><td><label for=\"who\">"._EMAIL.":</label> </td><td><select name=\"who\" id=\"who\">
+			<option value=\"all\">"._ALLMEMBERS."</option>
+			<option value=\"authors\">"._AUTHORSONLY."</option>
+			<option value=\"admins\">"._ADMINS."</option>
+		</select></td></tr><tr><td><label for=\"category\">"._CATEGORY.":</label> </td><td><select name=\"category\" id=\"category\" onChange='if(this.selectedIndex.value == false) return false; else document.location = document.location.pathname + \"?action=mailusers&amp;cat=\" + document.form.category.options[document.form.category.selectedIndex].value;'><option value=\"all\">"._ALL."</option>";
+		$result = dbquery("SELECT category, catid, parentcatid FROM ".TABLEPREFIX."fanfiction_categories ORDER BY leveldown, displayorder");
+		while($cats = dbassoc($result)) {
+			if($cats['catid'] == $cat || $cats['parentcatid'] == $cat) {
+				$output .= "<option value=\"".$cats['catid']."\"";
+				if($cats['catid'] == $cat) $output .= " selected";
+				$output .= ">".$cats['category'];
+				$output .= "</option>";
+			}		
+		}
+		$output .= "</select></td></tr>
+		<tr><td><label for=\"subject\">"._SUBJECT.":</label> </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"subject\"></td></tr>
+		<tr><td valign=\"top\"><label for=\"mailtext\">"._TEXT.":</label> </td><td><textarea class=\"textbox\" name=\"mailtext\" cols=\"40\" rows=\"6\"></TEXTAREA></td></tr>
+		<tr><td><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></td></tr></table></form>";
+		$output .= "<br /><br /><div style='text-align: center;'>"._EMAILWARNING."</div><br />";
+	}
+
+?>

--- /dev/null
+++ b/admin/maintenance.php
@@ -1,1 +1,215 @@
-
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+$maint = isset($_GET['maint']) ? $_GET['maint'] : false;
+$output .= "<div id='pagetitle'>"._ARCHIVEMAINT."</div>";
+if($maint == "update") {
+	if(file_exists("admin/update.php")) include_once("admin/update.php");
+}
+if($maint == "reviews") {
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET rating = '0', reviews = '0'"); // Set them all to 0 before we re-insert.
+	$stories = dbquery("SELECT AVG(rating) as average, item FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND rating != '-1' GROUP BY item");
+	while($s = dbassoc($stories)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET rating = '".round($s['average'])."' WHERE sid = '".$s['item']."'");
+	}
+	$stories = dbquery("SELECT COUNT(reviewid) as count, item FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND review != 'No Review' GROUP BY item");
+	while($s = dbassoc($stories)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET reviews = '".$s['count']."' WHERE sid = '".$s['item']."'");
+	}
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET rating = '0', reviews = '0'");
+	$chapters = dbquery("SELECT AVG(rating) as average, chapid FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND rating != '-1' GROUP BY chapid");
+	while($c = dbassoc($chapters)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET rating = '".round($c['average'])."' WHERE chapid = '".$c['chapid']."'");
+	}
+	$chapters = dbquery("SELECT COUNT(reviewid) as count, chapid FROM ".TABLEPREFIX."fanfiction_reviews WHERE type = 'ST' AND review != 'No Review' GROUP BY chapid");
+	while($c = dbassoc($chapters)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET reviews = '".$c['count']."' WHERE chapid = '".$c['chapid']."'");
+	}
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_series SET rating = '0', reviews = '0'");
+	$series = dbquery("SELECT seriesid FROM ".TABLEPREFIX."fanfiction_series");
+	while($s = dbassoc($series)) {
+		$thisseries = $s['seriesid'];
+		include("includes/seriesreviews.php");
+	}
+	// For modules which may allow reviews.
+	$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'revfix'");
+	while($code = dbassoc($codequery)) {
+		$eval($code['code_text']);
+	}
+	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_RECALCREVIEWS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "stories") {
+		$authors = dbquery("SELECT uid, count(uid) AS count FROM ".TABLEPREFIX."fanfiction_stories WHERE validated > 0 GROUP BY uid");
+		while($a = dbassoc($authors)) {
+			$alist[$a['uid']] = $a['count'];
+		}
+		$coauthors = dbquery("SELECT uid, count(sid) AS count FROM ".TABLEPREFIX."fanfiction_coauthors GROUP BY uid");
+		while($ca = dbassoc($coauthors)) {
+			if(isset($alist[$ca['uid']])) $alist[$ca['uid']] = $alist[$ca['uid']] + $ca['count'];
+			else $alist[$ca['uid']] = $ca['count'];
+		}
+		foreach($alist AS $a => $s) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET stories = '$s' WHERE uid = '$a' LIMIT 1");
+		}
+		$count =  dbquery("SELECT SUM(wordcount) as count, sid FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated = '1' GROUP BY sid");
+		while($c = dbassoc($count)) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET wordcount = '".$c['count']."' WHERE sid = '".$c['sid']."'");
+		}
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "categories") {
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET numitems = '0'");
+	$cats = dbquery("SELECT catid FROM ".TABLEPREFIX."fanfiction_categories ORDER BY leveldown DESC");
+	while($cat = dbrow($cats)) {
+		unset($subcats);
+		$subs = dbquery("SELECT catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = $cat[0]");
+		$subcats = array( );
+		while($sub = dbrow($subs)) {
+			$subcats[] = $sub[0];
+			if($categories[$sub[0]]) $subcats = array_merge($subcats, $categories[$sub[0]]);
+		}
+		$categories[$cat[0]] = $subcats;
+		$countquery = dbquery("SELECT count(sid) FROM ".TABLEPREFIX."fanfiction_stories WHERE FIND_IN_SET('$cat[0]', catid) ".(count($subcats) > 0 ? " OR FIND_IN_SET(". implode(", catid) OR FIND_IN_SET(",$subcats).", catid)" : "")." AND validated > 0");
+		list($count) = dbrow($countquery);
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET numitems = $count WHERE catid = $cat[0]");
+	}
+	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_CATCOUNTS, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");
+	$output .= write_message(_CATCOUNTSUPDATED);
+}
+else if($maint == "categories2") {
+	$selectA = "SELECT category, catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = -1 ORDER BY displayorder";
+	$resultA = dbquery($selectA);
+	$countA = 1;
+	while($cat = dbassoc($resultA)) {
+		$count = 1;
+		if($cat['parentcatid'] = -1) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $countA WHERE catid = $cat[catid]");
+			$countA++;
+		}
+		$selectB = "SELECT category, catid FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '$cat[catid]' ORDER BY displayorder";
+		$resultB = dbquery($selectB);
+		while($sub = dbassoc($resultB)) {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_categories SET displayorder = $count WHERE catid = $sub[catid]");
+			$count++;
+		}
+	}
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "stats") {
+	// check that the statisics is working before doing anything else
+	$check = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_stats WHERE sitekey = '".SITEKEY."' LIMIT 1");
+	if(dbnumrows($check) < 1) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stats(`sitekey`) VALUES('".SITEKEY."')");
+
+	$serieslist = dbquery("SELECT seriesid FROM ".TABLEPREFIX."fanfiction_series");
+	$totalseries = dbnumrows($serieslist);
+	while($s = dbassoc($serieslist)) {
+		$numstories = count(storiesInSeries($s['seriesid']));
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_series SET numstories = '$numstories' WHERE seriesid = ".$s['seriesid']." LIMIT 1");
+	}
+
+	$newslist = dbquery("SELECT count(cid) as count, nid FROM ".TABLEPREFIX."fanfiction_comments GROUP BY nid");
+	while($n = dbassoc($newslist)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_news SET comments = '".$n['count']."' WHERE nid = ".$n['nid']);
+	}
+
+	$storiesquery =dbquery("SELECT COUNT(sid) as totals, SUM(wordcount) as totalwords FROM ".TABLEPREFIX."fanfiction_stories WHERE validated > 0 ");
+
+	list($stories, $words) = dbrow($storiesquery);
+	list($authors) = dbrow(dbquery("SELECT count(uid) FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE stories > 0"));
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET stories = '$stories', authors = '$authors', wordcount = '$words' WHERE sitekey = '".SITEKEY."'"); 
+
+	$chapterquery = dbquery("SELECT COUNT(chapid) as chapters FROM ".TABLEPREFIX."fanfiction_chapters where validated > 0");
+	list($chapters) = dbrow($chapterquery);
+
+	$authorquery = dbquery("SELECT COUNT("._UIDFIELD.") as totalm FROM "._AUTHORTABLE);
+	list($members) = dbrow($authorquery);
+
+	list($newest) = dbrow(dbquery("SELECT "._UIDFIELD." as uid FROM "._AUTHORTABLE." ORDER BY "._UIDFIELD." DESC LIMIT 1"));
+	$reviewquery = dbquery("SELECT COUNT(reviewid) as totalr FROM ".TABLEPREFIX."fanfiction_reviews WHERE review != 'No Review'");
+	list($reviews) = dbrow($reviewquery);
+	$reviewquery = dbquery("SELECT COUNT(DISTINCT uid) FROM ".TABLEPREFIX."fanfiction_reviews WHERE review != 'No Review' AND uid != 0");
+	list($reviewers) = dbrow($reviewquery);
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET series = '$totalseries', chapters = '$chapters', members = '$members', newestmember = '$newest', reviews = '$reviews', reviewers = '$reviewers' WHERE sitekey = '".SITEKEY."'"); 
+	$news = dbquery("SELECT count(nid) as count, nid FROM ".TABLEPREFIX."fanfiction_comments GROUP BY nid");
+	while($n = dbassoc($news)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_news SET comments = '".$n['count']."' WHERE nid = '".$n['nid']."' LIMIT 1");
+	}
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "panels") {
+	$ptypes = dbquery("SELECT panel_type FROM ".TABLEPREFIX."fanfiction_panels GROUP BY panel_type");
+	while($ptype = dbassoc($ptypes)) {
+		if($ptype['panel_type'] == "A") {
+			for($x = 1; $x < 5; $x++) {
+				$count = 1;
+				$plist = dbquery("SELECT panel_name, panel_id FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden = '0' AND panel_type = '".$ptype['panel_type']."' AND panel_level = '$x' ORDER BY panel_level, panel_order");
+				while($p = dbassoc($plist)) {
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$count' WHERE panel_id = '".$p['panel_id']."' LIMIT 1");
+					$count++;
+				}
+			}
+		}
+		else {
+			$count = 1;
+			$plist = dbquery("SELECT panel_name, panel_id FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden = '0' AND panel_type = '".$ptype['panel_type']."' ORDER BY ".($ptype['panel_type'] == "A" ? "panel_level," : "")."panel_order");
+			while($p = dbassoc($plist)) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$count' WHERE panel_id = '".$p['panel_id']."' LIMIT 1");
+				$count++;
+			}
+		}
+	}
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "optimize") {
+	$alltables = dbquery("SHOW TABLES");
+
+	while ($table = dbassoc($alltables)) {
+		foreach ($table as $db => $tablename) {
+			dbquery("OPTIMIZE TABLE `".$tablename."`");
+		}
+	}
+ 	if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_OPTIMIZE, USERPENNAME, USERUID))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'AM', " . time() . ")");
+	$output .= write_message(_ACTIONSUCCESSFUL);
+}
+else if($maint == "backup") {
+}
+else {
+	$output .= "
+<ul>
+	<li><a href='admin.php?action=maintenance&amp;maint=reviews'>"._RECALCREVIEWS."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RECALCREVIEWS."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=stories'>"._RECALCSTORIES."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RECALCSTORIES."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=categories'>"._COUNTCATS."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATCOUNTS."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=categories2'>"._CATORDER."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_CATORDER."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=stats'>"._STATS."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_STATS."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=panels'>"._PANELORDER."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_PANELORDER."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=optimize'>"._OPTIMIZE."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_OPTIMIZE."</span></A></li>
+	<li><a href='admin/backup.php' target='_new'>"._BACKUP."</a> <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_BACKUP."</span></A></li>
+	<li><a href='admin/backup_utf8.php' target='_new'>"._BACKUP."</a> (UTF-8) <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_BACKUP."</span></A></li>
+	<li><a href='admin.php?action=maintenance&amp;maint=update'>"._UPDATE."</a>  <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_UPDATE."</span></A></li>
+</ul>";
+}
+?>

--- /dev/null
+++ b/admin/manual.php
@@ -1,1 +1,32 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+if(file_exists("docs/adminmanual_{$language}.htm")) $file = "docs/adminmanual_{$language}.htm";
+else $file = "docs/adminmanual_en.htm";
+$log_file = @fopen($file, "r");
+$output .= @fread($log_file, filesize($file));
+@fclose($log_file);
+?>

--- /dev/null
+++ b/admin/members.php
@@ -1,1 +1,272 @@
-
+<?php
+
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+function random_char($string)
+{
+	$length = strlen($string);
+	$position = mt_rand(0, $length - 1);
+	return($string[$position]);
+}
+
+function random_string ($charset_string, $length)
+{
+	$return_string = random_char($charset_string);
+	for ($x = 1; $x < $length; $x++)
+	$return_string .= random_char($charset_string);
+	return($return_string);
+}
+
+unset($countquery, $authorquery);
+$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+	if(isset($_GET['lock']) && isNumber($_GET['lock'])) {
+		$output .= "<div class='sectionheader'>"._LOCKMEM."</div>";
+		if($confirm == "yes") {
+			if(check_prefs($_GET['lock'])) dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET level = '-1' WHERE uid = '".$_GET['lock']."'");
+			else dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorprefs(`uid`, `level`) VALUES('".$_GET['lock']."', '-1')");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no") {
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_LOCKCONFIRM."<br /><br />
+						[ <a href=\"admin.php?action=members&confirm=yes&lock=".$_GET['lock']."\">"._YES."</a> | <a href=\"admin.php?action=members&confirm=no&lock=".$_GET['lock']."\">"._NO."</a> ]");
+		}
+	}
+	else if(isset($_GET["unlock"]) && isNumber($_GET["unlock"])) {
+		$output .= "<div class='sectionheader'>"._UNLOCK."</div>";
+		if($confirm == "yes")
+		{
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET level = '0' WHERE uid = '".$_GET['unlock']."'");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no")
+		{
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else
+		{
+			$output .= write_message(_CONFIRMUNLOCK."<br /><br />
+						[ <a href=\"admin.php?action=members&confirm=yes&unlock=".$_GET['unlock']."\">"._YES."</a> | <a href=\"admin.php?action=members&confirm=no&unlock=".$_GET['unlock']."\">"._NO."</a> ]");
+		}
+	
+	}
+	else if(isset($_GET["release"]) && isNumber($_GET['release'])) {
+		$output .= "<div class='sectionheader'>"._RELEASED."</div>";
+		if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors as author") $output .= write_message("<br />"._FOREIGNAUTHORTABLE);
+		if($confirm == "yes")
+		{
+			include("includes/emailer.php");
+			dbquery("UPDATE "._AUTHORTABLE." SET admincreated = '0' WHERE "._UIDFIELD." = '".$_GET['release']."'");
+			$emailquery = dbquery("SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE uid = '".$_GET['release']."'");
+			$email = dbassoc($emailquery);
+			mt_srand((double)microtime() * 1000000);
+			$charset = '23456789' . 'abcdefghijkmnpqrstuvwxyz' . 'ABCDEFGHJKLMNPQRSTUVWXYZ';
+			$pass = random_string($charset, 10);
+			$encryppass = md5($pass);
+			//$headers = "From: $sitename\n";
+			dbquery("UPDATE "._AUTHORTABLE." SET "._PASSWORDFIELD." = '$encryppass' WHERE uid = '".$_GET['release']."'");
+			
+			$subject = _SIGNUPSUBJECT;
+			
+			$letter = sprintf(_RELEASEMESSAGE, $email['penname'], $pass);
+
+			$mailresult = sendemail($email['penname'], $email['email'], $sitename, $siteemail, $subject, $letter);
+			if($mailresult) $output .= write_message(_AUTHORRELEASED);
+			else $output .= write_error(_EMAILFAILED);
+		}
+		else if ($confirm == "no")
+		{
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_CONFIRMAUTHORRELEASE."<br /><br />
+						[ <a href=\"admin.php?action=members&confirm=yes&release=$_GET[release]\">"._YES."</a> | <a href=\"admin.php?action=members&confirm=no&release=$_GET[release]\">"._NO."</a> ]");
+		}
+	}	
+	else if(isset($_GET["revoke"]) && isNumber($_GET["revoke"])) {
+		$output .= "<div class='sectionheader'>"._REVOKEVAL."</div>";
+		if($confirm == "yes")
+		{
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET validated = '0' WHERE uid = '$_GET[revoke]'");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no")
+		{
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else
+		{
+			$output .= write_message(_CONFIRMVALREVOKE."<br /><br />
+						[ <a href=\"admin.php?action=members&amp;confirm=yes&amp;revoke=$_GET[revoke]\">"._YES."</a> | <a href=\"admin.php?action=members&amp;confirm=no&amp;revoke=$_GET[revoke]\">"._NO."</a> ]");
+		}
+	}
+	else if(isset($_GET["delete"]) && isNumber($_GET["delete"])) {
+		$output .= "<div class='sectionheader'>"._DELETEUSER."</div>";
+		if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors as author") $output .= write_message("<br />"._FOREIGNAUTHORTABLE);
+		else if($confirm == "yes") {
+			include("includes/deletefunctions.php");
+			$output .= deleteUser($_GET['delete']);
+		}
+		else if ($confirm == "no") {
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_CONFIRMDELETE."<br /><br />
+						[ <a href=\"admin.php?action=members&confirm=yes&delete=$_GET[delete]\">"._YES."</a> | <a href=\"admin.php?action=members&confirm=no&delete=$_GET[delete]\">"._NO."</a> ]");
+		}
+	}
+	else if(isset($_GET["validate"]) && isNumber($_GET["validate"])) {
+		$output .= "<div class='sectionheader'>"._NONVALMEMBERS."</div>";
+		if($confirm == "yes") {
+			if(check_prefs($_GET['validate'])) dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET validated = '1' WHERE uid = '".$_GET['validate']."'");
+			else dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorprefs(`uid`, `validated`) VALUES('".$_GET['validate']."', '1')");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no") {
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else {
+			$output .= write_message(_CONFIRMVALIDATE."<br /><br />
+						[ <a href=\"admin.php?action=members&amp;confirm=yes&amp;validate=".$_GET['validate']."\">"._YES."</a> | <a href=\"admin.php?action=members&confirm=no&amp;validate=".$_GET['validate']."\">"._NO."</a> ]");
+		}
+	}
+	else if(isset($_GET["do"]) && $_GET['do'] == "add") {
+		if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors as author") $output .= write_message("<br />"._FOREIGNAUTHORTABLE);
+		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=members\"><table align=\"center\"><tr><td colspan=\"2\">
+			<div style='text-align: center; font-weight: bold;'>"._ADDAUTHOR." <A HREF=\"javascript:n_window('docs/adminhints.htm#addauthor');\">[?]</A></div></td></tr>
+			<tr><td><label for=\"penname\">"._PENNAME.":</label></td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"penname\"></td></tr>
+			<tr><td><label for=\"realname\">"._REALNAME.":</label></td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"realname\"></td></tr>
+			<tr><td><label for=\"email\">"._EMAIL.":</label></td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"email\"></td></tr>
+			<tr><td colspan=\"2\"><INPUT type=\"submit\" class=\"button\" value=\""._SUBMIT."\" name=\"submit\"></form></td></tr></table>";
+		}
+		else if (isset($_POST['submit'])) {
+			if(preg_match("!^[a-z0-9_ ]{3,30}$!i", $_POST['penname'])) {
+				dbquery("INSERT INTO ".substr(_AUTHORTABLE, 0, strpos(_AUTHORTABLE, "as author"))."(penname, realname, email, admincreated, date) VALUES ('".escapestring(descript($_POST['penname']))."', '".escapestring(descript($_POST['realname']))."', '".escapestring(descript($_POST['email']))."', '1', now())");
+				$newuid = dbinsertid( );
+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_ADMIN_REG, descript($_POST['penname']), $newuid, USERPENNAME, USERUID, $_SERVER['REMOTE_ADDR']))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'RG', " . time() . ")");
+				if(!$skin) {
+					$skinquery = dbquery("SELECT skin FROM ".$settingsprefix."fanfiction_settings WHERE sitekey ='".SITEKEY."'");
+					list($skin) = dbrow($skinquery);
+				}
+				dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_authorprefs(uid, userskin, storyindex, sortby) VALUES('$newuid', '$skin', '$displayindex', '$defaultsort')");
+				
+				$output .= write_message(_ACTIONSUCCESSFUL);
+			}
+		else $output .= write_error(_BADUSERNAME);
+	}
+	else {
+		$output .= "<div class='sectionheader'>";
+		if(isset($_GET['list'])) $list = $_GET['list'];
+		else $list = false;
+		$where = "";
+
+		if($list  == "admincreated") {
+			if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors as author") {
+				$fieldtest = dbquery("SHOW COLUMNS FROM ".substr(_AUTHORTABLE, 0, strlen(_AUTHORTABLE) - 9)." LIKE 'admincreated'");
+			}
+			if(isset($fieldtest) && !dbnumrows($fieldtest)) {
+				$where = "";
+				$output .= write_message(_FUNCTIONDISABLED);
+				$tpl->assign("output", $output);
+				$tpl->printToScreen( );
+				dbclose( );
+				exit();
+			}
+			else {
+				$where = " WHERE author.admincreated = '1'";
+				$do = "release";
+				$output .= _INPUTBYADMIN;
+				$message = write_message(_RELEASEAUTHORS);
+			}
+		}
+		else if($list == "admins") {
+			$where = " WHERE ap.level > 0";
+			$do = false;
+			$authorlink = "<a href=\"admin.php?action=admins&amp;do=edit&amp;uid=";
+			$output .= _ADMINS;
+		}
+		else if($list == "noval") {
+			$where = " WHERE  ap.validated IS NULL OR ap.validated = '0'";
+			$do = "validate";
+			$output .= _NONVALMEMBERS;
+		}
+		else if($list == "validated") {
+			$where = " WHERE ap.validated = '1'";
+			$do = "revoke";
+			$output .= _VALMEMBERS;
+		}
+		else if($list == "locked") {
+			$where = " WHERE ap.level = -1";
+			$do = "unlock";
+			$output .= _LOCKMEM;
+		}
+		else if($list == "unlocked") {
+			$where = " WHERE (ap.level IS NULL OR ap.level > -1) ";
+			$do = "lock";
+			$output .= _UNLOCKMEMBERS;
+			$message = write_message(_LOCKMEMBERS);
+		}
+		else if($list == "authors") {
+			$where = " WHERE ap.stories > 0";
+			$authorlink = "<a href=\"user.php?action=editbio&amp;uid=";
+			$output .= _AUTHORS;
+		}
+		else {
+			$where = "";
+			$do = "members";
+			$authorlink = "<a href=\"user.php?action=editbio&amp;uid=";
+			$output .= _MEMBERS;
+		}
+		if($let == _OTHER) {
+			$where .= (empty($where) ? " WHERE " : " AND ")._PENNAMEFIELD." REGEXP '^[^a-z]'";
+			$output .= " - "._OTHER;
+		}
+		else if($let){
+			$where .= (empty($where) ? " WHERE " : " AND ")._PENNAMEFIELD." LIKE '$let%'";
+			$output .= " - $let";
+		}
+		$list = $list;
+		if(!$list) $list = "members";
+		$output .= "</div>";
+		if(!isset($authorlink)) $authorlink = "<a href=\"admin.php?action=members&amp;do=list&amp;$do=";
+		if(!isset($countquery)) $countquery = _MEMBERCOUNT." $where";
+		if(!isset($authorquery)) $authorquery = _MEMBERLIST." $where GROUP BY "._UIDFIELD;
+		$output .= "<p align=\"center\">
+			<a href=\"admin.php?action=members\">"._ALLMEMBERS."</a> | <a href=\"admin.php?action=members&amp;do=list&amp;list=admins\">"._ADMINS."</a> |  <a href=\"admin.php?action=members&amp;do=list&amp;list=authors\">"._AUTHORS."</a> | <a href=\"admin.php?action=members&amp;do=list&amp;list=admincreated\">"._INPUTBYADMIN."</a> <br />
+			<a href=\"admin.php?action=members&amp;do=list&amp;list=noval\">"._NONVALMEMBERS."</a> | <a href=\"admin.php?action=members&amp;do=list&amp;list=validated\">"._VALMEMBERS."</a> | <a href=\"admin.php?action=members&amp;do=list&amp;list=locked\">"._LOCKMEMLIST."</a> | <a href=\"admin.php?action=members&amp;do=list&amp;list=unlocked\">"._UNLOCKMEMBERS."</a></p>";
+		$pagelink = "admin.php?action=members&amp;do=list&amp;list=$list&amp;".($let ? "let=$let&amp;" :"");
+
+		include("includes/members_list.php");
+		if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors as author") {
+			$fieldtest = dbquery("SHOW COLUMNS FROM ".substr(_AUTHORTABLE, 0, strlen(_AUTHORTABLE) - 9)." LIKE 'admincreated'");
+			if(dbnumrows($fieldtest)) $output .= write_message("<a href=\"admin.php?action=members&do=add\">"._ADDAUTHOR."</a>");
+		}
+		else $output .= write_message("<a href=\"admin.php?action=members&do=add\">"._ADDAUTHOR."</a>");
+		if(isset($message)) $output .= $message;
+	}
+?>

--- /dev/null
+++ b/admin/messages.php
@@ -1,1 +1,45 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+	$output .= "<div id=\"pagetitle\">"._MESSAGESETTINGS."</div>";
+
+if(isset($_POST['submit'])) {
+	$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_messages SET message_text = '".escapestring(descript($_POST['text']))."' WHERE message_name = '".$_GET['message']."' LIMIT 1");
+	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+	else $output .= write_error(_ERROR);
+}
+else {
+	$pagequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = '".$_GET['message']."' LIMIT 1");
+	$message =  dbassoc($pagequery);
+	$text = $message['message_text'];
+	if(!$message) dbquery("INSERT INTO `".TABLEPREFIX."fanfiction_messages` (`message_name` , `message_title` , `message_text` ) VALUES ('".$_GET['message']."', '', '')");
+	$output .= "<div class='sectionheader'>".preg_replace("@\{sitename\}@", $sitename, $message['message_title'])."</div>
+		<div style='width: 100%;'><div  id=\"settingsform\"><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=messages&message=".$_GET['message']."\">
+		<textarea rows=\"10\" cols=\"60\" style=\"width: 100%;\" ".($_GET['message'] == "tinyMCE" ? "class='mceNoEditor'" :"")." name=\"text\">$text</textarea>";
+	if($tinyMCE && $_GET['message'] != "tinyMCE") 
+		$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('text');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+	$output .= "<div style='clear: both;'>&nbsp;</div><INPUT type='submit' class='button' id='submit' value='"._SUBMIT."' name='submit'>
+				</form></div><div style='clear: both;'>&nbsp;</div></div>";
+}
+?>

--- /dev/null
+++ b/admin/modules.php
@@ -1,1 +1,79 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+$dir = opendir("modules");
+$admin = isset($_GET['admin']) && $_GET['admin'] == true ? true : false;
+$module = isset($_GET['module']) ? $_GET['module'] : false;
+if(!$module) {
+	$output .= "<table class=\"tblborder\" cellpadding=\"0\" cellspacing=\"0\" style=\"margin: 0 auto;\">
+	<tr><th class=\"tblborder\">"._NAME."</th><th class=\"tblborder\">"._VERSION."</th><th class=\"tblborder\">"._OPTIONS."</th></tr>";
+	$modquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_modules ORDER BY name");
+	while($m = dbassoc($modquery)) {
+		$modules[$m['name']] = $m;
+	}
+}
+while($folder = readdir($dir)) {
+	if($folder == "." || $folder == ".." || !is_dir("modules/$folder")) continue;
+	$moduleVersion = ""; $moduleName = ""; $moduleDescription = ""; $moduleAuthor = ""; $moduleOpts = array( ); 
+	$moduleAuthorEmail = ""; $moduleWebsite = "";
+	if($module && $module == $folder) {
+		if($admin) {
+			if(file_exists("modules/$folder/admin.php")) include("modules/$folder/admin.php");
+			else accessDenied( );
+		}
+		else if(file_exists("modules/$folder/version.php")) {
+			include("modules/$folder/version.php");
+			$output .= "<div class='sectionheader'>$moduleName - $moduleVersion</div>";
+			if($moduleDescription) $output .= "<p><span class='label'>"._DESC.":</span> $moduleDescription</p>";
+			if($moduleAuthor || $moduleAuthorEmail) $output .= "<p><span class='label'>"._AUTHOR.":</span> ".($moduleAuthorEmail ? "<a href='mailto:$moduleAuthorEmail'>".($moduleAuthor ? $moduleAuthor : $moduleAuthorEmail)."</a>" : $moduleAuthor)."</p>";
+			if($moduleWebsite) $output .= "<p><span class='label'>"._WEBSITE.":</span> <a href='$moduleWebsite'>$moduleWebsite</a></p>";
+			if(file_exists("modules/$folder/changelog.txt")) {
+				$output .= "<p><span class='label'>"._CHANGELOG."</span>:<br /><br />";
+				$file = "modules/$folder/changelog.txt";
+				$log_file = @fopen($file, "r");
+				$file_contents = @fread($log_file, filesize($file));
+				$output .= format_story($file_contents);
+				@fclose($log_file);
+			}
+		}
+		else $output .= write_message(_NORESULTS);
+	}
+	else if(!$module) {
+		if(!file_exists("modules/".$folder."/version.php")) continue;
+		else include("modules/".$folder."/version.php");
+		if(empty($moduleName)) continue;
+		$output .= "<tr><td class=\"tblborder\"><a href='admin.php?action=modules&amp;module=$folder'>$moduleName</a></td><td class=\"tblborder\" style=\"text-align: center;\">".(isset($modules[$moduleName]['version']) ? $modules[$moduleName]['version'] : $moduleVersion)."</td><td class=\"tblborder\">";
+		if(file_exists("modules/$folder/install.php") && !isset($modules[$moduleName])) $moduleOpts[] = "<a href='modules/$folder/install.php'>"._INSTALLMODULE."</a>";
+		if(isset($modules[$moduleName]['version']) && $modules[$moduleName]['version'] < $moduleVersion && file_exists("modules/$folder/update.php")) $moduleOpts[] = "<a href='modules/$folder/update.php'>"._UPDATE."</a> ";
+		if(file_exists("modules/$folder/admin.php") && isset($modules[$moduleName])) $moduleOpts[] = "<a href='admin.php?action=modules&amp;module=$folder&admin=true'>"._OPTIONS."</a>";
+		if(file_exists("modules/$folder/uninstall.php") && isset($modules[$moduleName])) $moduleOpts[] = "<a href='modules/$folder/uninstall.php'>"._UNINSTALLMODULE."</a>";
+		$output .= implode(" | ", $moduleOpts);
+		$output .= "</td></tr>";
+	}
+}
+
+closedir($dir);
+if(!$module) $output .= "</table>";
+?>

--- /dev/null
+++ b/admin/news.php
@@ -1,1 +1,111 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if (!defined("_CHARSET")) exit();
+if (uLEVEL > 3) accessDenied();
+$output .= "<div id=\"pagetitle\">" . _NEWS . "</div>";
+if (isset($_POST['submit']))
+{
+	$title = addslashes(strip_tags(descript($_POST['title']), $allowed_tags));
+	$author = addslashes(strip_tags(descript($_POST['author']), $allowed_tags));
+	$story = addslashes(strip_tags(descript($_POST['story']), $allowed_tags));
+	$time = time();
+	if ($_GET['form'] == "new") $result = dbquery("INSERT INTO " . TABLEPREFIX . "fanfiction_news (title, author, story, time) VALUES ('$title', '$author', '$story', '$time')");
+	else $result = dbquery("UPDATE " . TABLEPREFIX . "fanfiction_news 
+	SET title = '$title', author = '$author', story = '$story' WHERE nid = '$_POST[nid]'");
+	if ($result)
+	{
+		$output .= write_message(_ACTIONSUCCESSFUL);
+		unset($_GET['form']);
+	}
+	else $output .= write_error(_ERROR . " " . TRYAGAIN);
+}
+if (isset($_GET['delete']) && isNumber($_GET['delete']))
+{
+	if (isset($_GET['confirm']))
+	{
+		if ($_GET['confirm'] == "yes")
+		{
+			dbquery("DELETE FROM " . TABLEPREFIX . "fanfiction_news where nid = '" . $_GET['delete'] . "'");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($_GET['confirm'] == "no") $output .= write_message(_ACTIONCANCELLED);
+	}
+	else
+	{
+		$output .= write_message(_CONFIRMDELETE . "<br /><br />
+	[ <a href=\"admin.php?action=news&confirm=yes&delete=$_GET[delete]\">" . _YES . "</a> | <a href=\"admin.php?action=news&confirm=no&delete=$_GET[delete]\">" . _NO . "</a> ]");
+	}
+}
+else if (isset($_GET["form"]))
+{
+	if ($_GET["form"] != "new" && isNumber($_GET["form"]))
+	{
+		$result = dbquery("SELECT * FROM " . TABLEPREFIX . "fanfiction_news WHERE nid = '" . $_GET['form'] . "' LIMIT 1");
+		$newsitem = dbassoc($result);
+	}
+	else $newsitem = array("title" => "", "author" => "", "story" => "");
+	$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=news&form=$_GET[form]\">
+				<table align=\"center\"><tr><td colspan=\"2\" align=\"center\"><b>" . ($_GET["form"] == "new" ? _ADDNEWS : _EDITNEWS) . "</b></td></tr>
+			<tr><td>" . _AUTHOR . ": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"author\" value=\"" . stripslashes($newsitem['author']) . "\"></td></tr>
+			<tr><td>" . _TITLE . ": </td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"title\" value=\"" . stripslashes($newsitem['title']) . "\"></td></tr>
+			<tr><td>" . _TEXT . ": </td><td><textarea class=\"textbox\" name=\"story\" id=\"story\" COLS=\"45\" ROWS=\"6\">" . stripslashes($newsitem['story']) . "</TEXTAREA>";
+	if ($tinyMCE)
+		$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('story');\" checked><label for='toggle'>" . _TINYMCETOGGLE . "</label></div>";
+
+	$output .= "</td></tr><tr><td colspan=\"2\" align=\"center\">" . ($_GET["form"] != "new" ? "<INPUT type=\"hidden\" name=\"nid\" value=\"" . $_GET['form'] . "\">" : "") . "<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\"" . _SUBMIT . "\"></td></tr></table></form>";
+}
+else
+{
+	$output .= "<p align=\"center\"><a href=\"admin.php?action=news&form=new\">" . _ADDNEWS . "</a></p>";
+	$count = dbquery("SELECT COUNT(nid) FROM " . TABLEPREFIX . "fanfiction_news");
+	list($numrows) = dbrow($count);
+
+	$result = dbquery("SELECT n.*, n.time as date, count(c.cid) as comments FROM " . TABLEPREFIX . "fanfiction_news as n LEFT JOIN " . TABLEPREFIX . "fanfiction_comments as c ON  n.nid = c.nid GROUP BY n.nid ORDER BY time DESC LIMIT $offset, $itemsperpage");
+	if (file_exists("$skindir/newsbox.tpl")) $news = new TemplatePower("$skindir/newsbox.tpl");
+	else $news = new TemplatePower("default_tpls/newsbox.tpl");
+	$news->prepare();
+	$count = 0;
+	while ($stories = dbassoc($result))
+	{
+		$news->newBlock("newsbox");
+
+		//assign values
+		$news->assign("newstitle", $stories['title']);
+		$news->assign("newsstory", $stories['story']);
+		$news->assign("newsauthor", $stories['author']);
+		$news->assign("newsdate", date("$dateformat $timeformat", $stories['date']));
+		$news->assign("oddeven", ($count % 2 ? "even" : "odd"));
+		if ($newscomments == "1")
+			$news->assign("newscomments", "<a href=\"news.php?action=newsstory&amp;nid=" . $stories['nid'] . "\">" . $stories['comments'] . " " . _COMMENTS . "</a>");
+		if (isADMIN)
+			$news->assign("adminoptions", "<a href=\"admin.php?action=news&amp;form=" . $stories['nid'] . "\">" . _EDIT . "</a> | <a href=\"admin.php?action=news&amp;delete=" . $stories['nid'] . "\">" . _DELETE . "</a>");
+		$count++;
+	}
+	$news->gotoBlock("_ROOT");
+	$output .= $news->getOutputContent();
+	if ($numrows > $itemsperpage) $output .= build_pagelinks("admin.php?action=news&amp;", $numrows, $offset);
+}
+

--- /dev/null
+++ b/admin/noletter.php
@@ -1,1 +1,67 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$chapid = isset($_GET['chapid']) && isNumber($_GET['chapid']) ? $_GET['chapid'] : 0;
+
+		$adminquery = dbquery("SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE "._UIDFIELD." = '".USERUID."' LIMIT 1");
+		list($adminemail, $adminname) = dbrow($adminquery);
+		if($adminemail)
+			$ademail = $adminemail;
+		else 
+			$ademail = $siteemail;
+	if(isset($_POST['submit'])) {
+		$subject = strip_tags(descript($_POST['subject']));
+		$letter = descript($_POST['letter']);
+		include("includes/emailer.php");
+		$result = sendemail($_POST['authorname'], $_POST['authoremail'], $adminname, $ademail, $subject, $letter, "html");
+		if($result) echo write_message(_EMAILSENT);
+		else echo write_error(_NOMAILSENT);
+		if($logging) {
+			$storyquery = dbquery("SELECT story.title, chapter.title as chapter, author.email, author.penname, chapter.uid, chapter.inorder FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter, ".TABLEPREFIX."fanfiction_authors as author WHERE chapter.uid = author.uid AND chapter.chapid = '$chapid' AND chapter.sid = story.sid LIMIT 1");
+			$story = dbassoc($storyquery);
+			dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_REJECTION, USERPENNAME, USERUID, $title, $sid, $uid, $penname, $inorder, $letter))."', '".USERUID."', INET_ATON('".$_ENV['REMOTE_ADDR']."'), 'RJ', ". time() . ")");
+		}
+
+	}
+	else {
+			$storyquery = dbquery("SELECT story.title, chapter.title as chapter, "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname, chapter.uid FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter, "._AUTHORTABLE." WHERE chapter.uid = "._UIDFIELD." AND chapter.chapid = '$chapid' AND chapter.sid = story.sid LIMIT 1");
+			$story = dbassoc($storyquery);
+			$letterquery = dbquery("SELECT message_text, message_title FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = 'nothankyou' LIMIT 1");
+			list($letter, $subject) = dbrow($letterquery);
+			$search = array("@\{sitename\}@", "@\{adminname\}@",  "@\{author\}@", "@\{storytitle\}@",  "@\{chaptertitle\}@", "@\{rules\}@");
+			$replace = array( $sitename, $adminname, $story['penname'], $story['title'], $story['chapter'], "<a href=\"".$url."/viewpage.php?page=rules\">"._RULES."</a>");
+			$letter = preg_replace($search, $replace, $letter);
+			$subject = preg_replace($search, $replace, $subject);
+			echo "<body>
+			<div id=\"pagetitle\"> ".$story['title'].": ".$story['chapter']." "._BY." ".$story['penname']."</div>
+			<div style=\"line-height: 4ex; margin: 0 auto; width: 90%;\">
+				<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=noletter&amp;uid=".$story['uid']."&amp;chapid=".$_GET['chapid']."\">
+				<input type=\"hidden\" name=\"authoremail\" value=\"$story[email]\"><input type=\"hidden\" name=\"authorname\" value=\"story[penname]\">
+				<label for=\"subject\">"._SUBJECT.":</label> <INPUT type=\"text\" class=\"textbox=\" size=\"40\"  name=\"subject\" value=\"$subject\"><br />
+				<textarea class=\"textbox\" name=\"letter\" cols=\"40\" rows=\"7\">$letter</TEXTAREA><br /><INPUT type=\"submit\" style=\"margin: 10px;\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></div></body></html>";
+		exit( );
+	}
+?>

--- /dev/null
+++ b/admin/panels.php
@@ -1,1 +1,137 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$paneltypes = array("A" => _ADMIN, "U" => _USERACCOUNT, "P" => _PROFILE, "F" => _FAVOR, "S" => _SUBMISSIONS, "B" => _BROWSE, "L" => _10LISTS);
+
+if(isset($_GET['type'])) $type = $_GET['type'];
+else $type = false;
+if(!empty($_GET['go'])) {
+	$go = $_GET['go'];
+	$order = $_GET['order'];
+	if($go == "up") $oneabove = $order - 1;
+	else $oneabove = $order + 1;
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$order' WHERE panel_type = '$type' and panel_order = '$oneabove'");
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$oneabove' WHERE panel_id = '".$_GET['panel']."'");	
+}
+if(!empty($_GET['edit'])) {
+	if(!empty($_POST['submit'])) {
+		$panel_name = addslashes(strip_tags(descript($_POST['panel_name'])));
+		$panel_title = addslashes(strip_tags(descript($_POST['panel_title'])));
+		$panel_url = addslashes(strip_tags(descript($_POST['panel_url'])));
+		$panel_level = (!empty($_POST['panel_level']) && isNumber($_POST['panel_level']) ? $_POST['panel_level'] : 0);
+		$panel_hidden = (!empty($_POST['panel_hidden']) ? 1 : 0);
+		$panel_type = strip_tags(descript($_POST['panel_type']));
+		if(!$panel_hidden) {
+			$oldinfo = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_id = '".$_GET['edit']."'");
+			$panelinfo = dbassoc($oldinfo);
+			$nextorder = 0;
+			if($panelinfo['panel_hidden'] || $_GET['edit'] == "new") {
+				$order = dbquery("SELECT COUNT(panel_id) FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_type = '$panel_type' AND panel_hidden = 0".($panel_type == "A" ? " AND panel_level = '$panel_level'" : ""));
+				list($nextorder) = dbrow($order);
+				$nextorder++;
+			}
+			else {
+				$nextorder = 0;
+			}
+		}
+		else if($panel_hidden) $nextorder = 0;
+		if($_GET['edit'] != "new") $result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_name = '$panel_name', panel_title = '$panel_title', panel_url = '$panel_url', panel_level = '$panel_level', panel_hidden = '$panel_hidden', panel_type = '$panel_type'".(!empty($panel_hidden) ? ", panel_order = '$nextorder'" : "")." WHERE panel_id = '".$_GET['edit']."'");
+		else $result = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_panels(`panel_name`, `panel_title`, `panel_url`, `panel_level`, `panel_hidden`, `panel_type`, `panel_order`) VALUES( '$panel_name', '$panel_title', '$panel_url', '$panel_level', '$panel_hidden', '$panel_type', '$nextorder')");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else {
+		$panelquery= dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_id = '".$_GET['edit']."' LIMIT 1");
+		$panelinfo = dbassoc($panelquery);
+		$output .= "<div class='sectionheader'>".($_GET['edit'] == "new" ? _ADDPANEL : _EDITPANEL)."</div>
+			<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" style='width: 450px; margin: 0 auto;' action=\"admin.php?action=panels&amp;edit=".$_GET['edit']."\">
+			<label for='panel_name'>"._NAME.":</label> <input type='text' class='textbox' name='panel_name' id='panel_name' value='".$panelinfo['panel_name']."'><br />
+			<label for='panel_title'>"._TITLE.":</label> <input type='text' class='textbox' name='panel_title' id='panel_title' value='".$panelinfo['panel_title']."'><br />
+			<label for='panel_url'>"._PANELURL.":</label> <input type='text' class='textbox' name='panel_url' id='panel_url' value='".$panelinfo['panel_url']."'><br />
+			<label for='panel_level'>"._LEVEL.":</label> <select name='panel_level' id='panel_level'>";
+		for($x = 0; $x < 5; $x++) { $output .= "<option".($panelinfo['panel_level'] == $x ? " selected" : "").">$x</option>"; }
+		$output .= "</select><br />
+			<label for='panel_hidden'>"._HIDDEN.":</label> <input type='checkbox' class='checkbox' name='panel_hidden' id='panel_hidden' ".($panelinfo['panel_hidden'] ? " checked" : "")."><br />
+			<label for='panel_type'>"._TYPE.":</label> <input type='text' class='textbox' name='panel_type' id='panel_type' value='".$panelinfo['panel_type']."' size='2'><br />
+			<div style='margin: 1em; text-align: center;'><INPUT type=\"submit\" class=\"button\" value=\""._SUBMIT."\" name=\"submit\"></div></form></div>";
+	}
+}
+else if(!empty($_GET['delete'])) {
+	$panel_id = $_GET['delete'];
+	$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+	if($confirm == "yes" && isNumber($panel_id)) {
+		$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_id = '$panel_id' LIMIT 1");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		else $output .= write_error(_ERROR);
+	}
+	else if ($confirm == "no") 	{
+		$output .= write_message(_ACTIONCANCELLED);
+	}
+	else {
+		$output .= write_message(_CONFIRMDELETE."<br /><br />
+			[ <a href=\"admin.php?action=panels&amp;delete=$panel_id&amp;confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=panels&amp;delete=$panel_id&amp;confirm=no\">"._NO."</a> ]");
+	}
+}
+else {
+	$output .= "<form name=\"list\" action=\"\"><div class='sectionheader'>"._PANELS." <A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_PANELS."</span></A><br /> <select name=\"list\" onchange=\"if(this.selectedIndex.value != 'false') document.location = document.list.list.options[document.list.list.selectedIndex].value\">";
+	$output .= "<option value=\"admin.php?action=panels\">"._ALL."</option>";
+	$paneltypelist = dbquery("SELECT DISTINCT panel_type FROM ".TABLEPREFIX."fanfiction_panels ORDER BY panel_type");
+	while($t = dbrow($paneltypelist)) {
+		$output .= "<option value='admin.php?action=panels&amp;type=$t[0]'".($type == $t[0] ? " selected" : "").">$t[0] - ".$paneltypes[$t[0]]."</option>";
+	}
+	$output .= "</select>";
+	if($type == "A") {
+		$output .= " "._LEVEL." <select name=\"list2\" onchange=\"if(this.selectedIndex.value != 'false') document.location = document.list.list2.options[document.list.list2.selectedIndex].value\">
+			<option value=\"admin.php?action=panels&amp;type=A\">"._ALL."</option>";
+		for($x = 1; $x < 4; $x++) {
+			$output .= "<option value='admin.php?action=panels&amp;type=A&amp;level=$x'".(isset($_GET['level']) && $_GET['level'] == $x ? " selected" : "")."> $x </option>";
+		}
+		$output .= "</select>";
+	}
+	$output .= "</div></form>";
+	$list = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels".($type ? " WHERE panel_type = '$type'".($type == "A" && !empty($_GET['level']) ? " AND panel_level = '".$_GET['level']."'" : "") : "")." ORDER BY panel_type, panel_hidden DESC, ".($type == "A" ? "panel_level DESC,  " : "")."panel_order ASC");
+	$num = dbnumrows($list);
+	if($num > 0) $output .= "<table class='tblborder' style='margin: 0 auto;'><tr><th class='tblborder'>"._NAME."</th>".(!$type || ($type == "A" && empty($_GET['level'])) ? "<th class='tblborder'>"._TYPE."</th>" : "<th class='tblborder'>"._ORDER."</th>")."<th class='tblborder'>"._OPTIONS."</th></tr><tr><td class='tblborder' colspan='3' align='center'><a href='admin.php?action=panels&amp;edit=new'>"._ADDNEWPANEL."</a></td></tr>";
+	$count = 0;
+	while($panel = dbassoc($list)) {
+		if(!$panel['panel_hidden']) $count++;
+		else $num--;
+		$output .= "<tr><td class='tblborder'>".$panel['panel_title']."</td><td class='tblborder'>";
+		if(!$type) $output .= $panel['panel_type']." - ".$paneltypes[$panel['panel_type']];
+		else if($type == "A" && empty($_GET['level'])) $output .= $panel['panel_hidden'] ? _HIDDEN :  _LEVEL." ".$panel['panel_level'];
+		else {
+			if($panel['panel_hidden']) $output .= _HIDDEN;
+			else {
+				$output .= $count > 1 ? "<a href='admin.php?action=panels&amp;type=$type&amp;go=up&amp;panel=".$panel['panel_id'].(!empty($_GET['level']) ? "&amp;level=".$_GET['level'] : "")."&amp;order=".$panel['panel_order']."'>$up</a>" : "";
+				$output .= $count < $num ? "<a href='admin.php?action=panels&amp;type=$type&amp;go=down&amp;panel=".$panel['panel_id'].(!empty($_GET['level']) ? "&amp;level=".$_GET['level'] : "")."&amp;order=".$panel['panel_order']."'>$down</a>" : "";
+			}
+		}
+		$output .= "</td><td class='tblborder'><a href='admin.php?action=panels&amp;edit=".$panel['panel_id']."'>"._EDIT."</a> | <a href='admin.php?action=panels&amp;delete=".$panel['panel_id']."'>"._DELETE."</a></td></tr>";
+	}
+	$output .= "</table>";
+}
+?>
+

--- /dev/null
+++ b/admin/phpinfo.php
@@ -1,1 +1,34 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+
+phpinfo( );
+foreach($settings as $var => $val) {
+	echo "$var : $val <br />";
+}
+exit( );
+
+?>

--- /dev/null
+++ b/admin/ratings.php
@@ -1,1 +1,106 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+$output .= "<div id=\"pagetitle\">"._RATINGS."</div>";
+	$showlist = 1;
+	if(isset($_GET["delete"]) && isNumber($_GET["delete"])) {
+		$rid = $_GET["delete"];
+		$confirm = isset($_GET["confirm"]) ? $_GET["confirm"] : false;
+		if($confirm == "yes")
+		{
+			$result5 = dbquery("SELECT rating FROM ".TABLEPREFIX."fanfiction_ratings WHERE rid = '$rid'");
+			$ratings = dbassoc($result5);
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET rid = '"._NONE."' WHERE sid = '$ratingresult[sid]'");
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_ratings WHERE rid = '$rid'");
+			$output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		else if ($confirm == "no")
+		{
+			$output .= write_message(_ACTIONCANCELLED);
+		}
+		else
+		{
+			$showlist = 0;
+			$output .= write_message(_CONFIRMDELETE."<br /><br />
+[ <a href=\"admin.php?action=ratings&delete=$rid&confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=ratings&delete=$rid&confirm=no\">"._NO."</a> ]");
+		}
+	}
+	if (isset($_POST["submit"]) && ((isset($_GET['rid']) && isNumber($_GET['rid'])) || $_GET['rid'] == "new")) {
+		$newrate = escapestring(strip_tags(descript($_POST['rating'])));
+		$newtext = escapestring(strip_tags(descript($_POST['warningtext'])));
+		$ratingwarning = isset($_POST['ratingwarning']) ? 1 : 0;
+		if(isset($_POST['rusersonly'])) $ratingwarning = $ratingwarning + 4;
+		if(isset($_POST['ageconsent'])) $ratingwarning = $ratingwarning + 2;
+		if($_GET["rid"] == "new") $ratingquery = "INSERT INTO ".TABLEPREFIX."fanfiction_ratings (rating, ratingwarning, warningtext) VALUES ('$newrate', '$ratingwarning', '$newtext')";
+		else $ratingquery = "UPDATE ".TABLEPREFIX."fanfiction_ratings SET rating = '$newrate', ratingwarning = '$ratingwarning', warningtext = '$newtext' WHERE rid = '".$_GET['rid']."'";
+		dbquery($ratingquery);
+		if($_GET["rid"] != "new" && $newrate != $_POST['oldrating']) dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET rid = '$newrate' WHERE rid = '".$_POST['oldrating']."'");
+		$output .= write_message(_ACTIONSUCCESSFUL);
+	}
+	else if(isset($_GET["rid"])) {
+		$showlist = 0;
+		$new = $_GET['rid'] == "new" ? true : false;
+		if(!$new && isNumber($_GET["rid"])) {
+			$ratingquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_ratings WHERE rid = '".$_GET['rid']."' LIMIT 1");
+			$rating = dbassoc($ratingquery);
+		}
+		$output .= "<form method=\"POST\" id='settingsform' enctype=\"multipart/form-data\" action=\"admin.php?action=ratings&rid=".$_GET['rid']."\">
+			<div class='sectionheader'>".($new ? _NEWRAT : _EDITRAT)."</div>
+			<div><label for='rating'>"._RATING.": </label> 
+			<INPUT  type=\"text\" class=\"textbox=\" name=\"rating\"".($new ? "" : "value=\"".$rating['rating']."\"")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RATING."</span></A>";
+		if(isset($rating)) 
+			$output .= "<input type=\"hidden\" name=\"oldrating\" value=\"".$rating['rating']."\">";
+		$warninglevel = isset($rating) ? sprintf("%03b", $rating['ratingwarning']) : array(0,0,0);
+		$output .= "</div><div><label for='ratingwarning'>"._WARNINGPOP.": </label>
+		<INPUT type=\"checkbox\" class=\"checkbox\" name=\"ratingwarning\"".(!$new && $warninglevel[2] ? " checked" : "")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RATINGWARNING."</span></A></div>
+		<div><label for='ageconsent'>"._AGECHECK.": </label>
+		<INPUT type=\"checkbox\" class=\"checkbox\" name=\"ageconsent\"".(!$new && $warninglevel[1] ? " checked" : "")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RATINGCONSENT."</span></A></div>
+		<div><label for='rusersonly'>"._RUSERSONLY.": </label>
+		<INPUT type=\"checkbox\" class=\"checkbox\" name=\"rusersonly\"".(!$new && $warninglevel[0] ? " checked" : "")."><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RATINGUSERS."</span></A></div>
+		<div><label for='warningtext'>"._WARNINGTEXT.": </label>
+		<textarea class=\"textarea\" name=\"warningtext\" cols=\"35\" rows=\"4\">".($new ? "" : $rating['warningtext'])."</TEXTAREA>";
+		if($tinyMCE) 
+			$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('warningtext');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";	
+		$output .= "</div><div style='text-align: center;'><A HREF=\"#\" class=\"pophelp\">[?]<span>"._HELP_RATINGWARNTEXT."</span></A></div><INPUT type=\"submit\" class=\"button\" id='submit' value=\""._SUBMIT."\" name=\"submit\">";
+	}
+	if($showlist) {
+		$result = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_ratings");
+
+		//List of current ratings
+		$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"o\" align=\"center\" style='margin: 0 auto;'>
+		<tr><th colspan=\"3\" align=\"center\" class=\"tblborder\">"._RATINGS."</th></tr>";
+		$output .= "<tr><td class=\"tblborder\"><b>"._RATING."</b></td><td class=\"tblborder\"><b>"._WARNING."</b></td><td class=\"tblborder\"><b>"._OPTIONS."</b></td></tr>";
+		while ($ratingresults = dbassoc($result))
+		{
+		$output .= "<tr><td class=\"tblborder\">".$ratingresults['rating'];
+			if($ratingresults['ratingwarning'] >= 1)
+				$output .= "</td><td class=\"tblborder\">"._YES."";
+			else
+				$output .= "</td><td class=\"tblborder\">"._NO."";
+			$output .= "</td><td class=\"tblborder\"><a href=\"admin.php?action=ratings&rid=".$ratingresults['rid']."\">"._EDIT."</a> | <a href=\"admin.php?action=ratings&delete=".$ratingresults['rid']."\">"._DELETE."</td></tr>";
+		}
+		$output .= "<tr><td colspan=\"3\" align=\"center\" class=\"tblborder\"><a href=\"admin.php?action=ratings&rid=new\">"._ADDRAT."</a></td></tr></table>";
+	}
+?>

--- /dev/null
+++ b/admin/settings.php
@@ -1,1 +1,487 @@
-
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+function updatePanelOrder( ) {
+	
+	$ptypes = dbquery("SELECT panel_type FROM ".TABLEPREFIX."fanfiction_panels GROUP BY panel_type");
+	while($ptype = dbassoc($ptypes)) {
+		if($ptype['panel_type'] == "A") {
+			for($x = 1; $x < 5; $x++) {
+				$count = 1;
+				$plist = dbquery("SELECT panel_name, panel_id FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden = '0' AND panel_type = '".$ptype['panel_type']."' AND panel_level = '$x' ORDER BY panel_level, panel_order");
+				while($p = dbassoc($plist)) {
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$count' WHERE panel_id = '".$p['panel_id']."' LIMIT 1");
+					$count++;
+				}
+			}
+		}
+		else {
+			$count = 1;
+			$plist = dbquery("SELECT panel_name, panel_id FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_hidden = '0' AND panel_type = '".$ptype['panel_type']."' ORDER BY ".($ptype['panel_type'] == "A" ? "panel_level," : "")."panel_order");
+			while($p = dbassoc($plist)) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_order = '$count' WHERE panel_id = '".$p['panel_id']."' LIMIT 1");
+				$count++;
+			}
+		}
+	}
+}
+
+if($action == "settings") {
+$output .= "<h1>"._SETTINGS."</h1><div style='text-align: center;'>
+	<a href='admin.php?action=settings&amp;sect=main'>"._MAINSETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=submissions'>"._SUBMISSIONSETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=sitesettings'>"._SITESETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=display'>"._DISPLAYSETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=reviews'>"._REVIEWSETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=useropts'>"._USERSETTINGS."</a> |
+	<a href='admin.php?action=settings&amp;sect=email'>"._EMAILSETTINGS."</a> |
+	<a href='admin.php?action=censor'>"._CENSOR."</a> <br />
+	<a href='admin.php?action=messages&message=welcome'>"._WELCOME."</a> | 
+	<a href='admin.php?action=messages&message=copyright'>"._COPYRIGHT."</a> | 
+	<a href='admin.php?action=messages&message=printercopyright'>"._PRINTERCOPYRIGHT."</a> | 
+	<a href='admin.php?action=messages&message=tinyMCE'>"._TINYMCE."</a> | 
+	<a href='admin.php?action=messages&message=nothankyou'>"._NOTHANKYOU."</a> | 
+	<a href='admin.php?action=messages&message=thankyou'>"._THANKYOU."</a><br />";
+	$settingsquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_panels WHERE panel_type = 'AS' ORDER BY panel_title");
+	while($os = dbassoc($settingsquery)) {
+		if($os['panel_url']) $othersettings[] = "<a href='".$os['panel_url']."'>".$os['panel_title']."</a>";
+	}
+	if(isset($othersettings)) $output .= implode(" | ", $othersettings);
+$output .= "</div> ";
+}	
+
+$sects = array("main", "submissions", "sitesettings", "display", "reviews", "useropts", "email");
+//if(!isset($_GET['sect'])) $sect = "main";
+//else $sect = $_GET['sect'];
+$sect = isset($_GET['sect']) ? $_GET['sect'] : "main";
+if(isset($_POST['submit'])) {
+	if($sect == "main") {
+		if(!preg_match("!^[a-z0-9_]{3,30}$!i", $_POST['newsitekey'])) $output .= write_error(_BADSITEKEY);
+		else {
+			$oldsitekey = $sitekey;
+			$sitekey = descript($_POST['newsitekey']);
+			$sitename = escapestring(descript(strip_tags($_POST['newsitename'])));
+			$slogan = escapestring(descript(strip_tags($_POST['newslogan'])));
+			$url = escapestring(descript(strip_tags($_POST['newsiteurl'])));
+			// if the http:// is missing add it.
+			if(substr($url, 0, 7) != "http://") $url = "http://".$url;
+			// we also want to check for a trailing slash.
+			if(substr($url, -1, 1) == "/") $url = substr($url, 0, strlen($url) - 1);
+			$tableprefix = escapestring(descript(strip_tags($_POST['newtableprefix'])));
+			$siteemail = escapestring(descript(strip_tags($_POST['newsiteemail'])));
+			$skin = escapestring(descript(strip_tags($_POST['newskin'])));
+			$language = escapestring(descript(strip_tags($_POST['newlanguage'])));
+			if(empty($sitekey)) $output .= write_message(_SITEKEYREQUIRED);
+			else {
+				if($sitekey != $oldsitekey) $output .= write_message(_SITEKEYCHANGED);
+				$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET sitekey = '$sitekey', sitename = '$sitename', slogan = '$slogan', url = '$url', tableprefix = '$tableprefix', siteemail = '$siteemail', skin = '$skin', language = '$language' WHERE sitekey = '$oldsitekey'");
+			}
+		}
+	}
+	else if($sect == "submissions") {
+		$submissionsoff = $_POST['newsubmissionsoff'] == 1 ? 1 : 0;
+		$autovalidate = $_POST['newautovalidate'] == 1 ? 1 : 0;
+		$coauthallowed = $_POST['newcoauthallowed'] == 1 ? 1 : 0;
+		$store = !empty($_POST['newstore']) ? ($_POST['newstore'] == "files" ? "files" : "mysql" ) : $store;
+		$storiespath = descript($_POST['newstoriespath']);
+		$minwords = isNumber($_POST['newminwords']) ? $_POST['newminwords'] : 0;
+		$maxwords = isNumber($_POST['newmaxwords']) ? $_POST['newmaxwords'] : 0;
+		$roundrobins = $_POST['newroundrobins'] == 1 ? 1 : 0;
+		$allowseries = $_POST['newallowseries'] && isNumber($_POST['newallowseries']) ? $_POST['newallowseries'] : 0;
+		$imageupload = $_POST['newimageupload'] == 1 ? 1 : 0;
+		$imageheight = isNumber($_POST['newimageheight']) ? $_POST['newimageheight'] : 0;
+		$imagewidth = isNumber($_POST['newimagewidth']) ? $_POST['newimagewidth'] : 0;
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET submissionsoff = '$submissionsoff', autovalidate = '$autovalidate', coauthallowed = '$coauthallowed', store = '$store', storiespath = '$storiespath', minwords = '$minwords', maxwords = '$maxwords', imageupload = '$imageupload', imageheight = '$imageheight', imagewidth = '$imagewidth', roundrobins = '$roundrobins', allowseries = '$allowseries' WHERE sitekey ='".SITEKEY."'");
+		if($action == "settings") {
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_hidden = '".($imageupload ? "0" : "1")."' WHERE panel_name LIKE 'manageimages'");
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_panels SET panel_hidden = '".($allowseries ? "0" : "1")."' WHERE (panel_name LIKE '%series%' OR panel_title LIKE '%series%') AND panel_type != 'A' AND panel_type != 'B'");
+			updatePanelOrder( );
+		}
+
+	}
+	else if($sect == "sitesettings") {
+		$tinyMCE = ($_POST['newtinyMCE'] == 1  OR $_POST['newtinyMCE'] == 2) ? $_POST['newtinyMCE'] : 0;
+		$allowed_tags = $_POST['newallowed_tags'];
+		$favorites = $_POST['newfavorites'] == 1 ? 1 : 0;
+		$multiplecats = $_POST['newmultiplecats'] == 1 ? 1 : 0;
+		$newscomments = $_POST['newnewscomments'] == 1 ? 1 : 0;
+		$logging = $_POST['newlogging'] == 1 ? 1 : 0;
+		$maintenance = $_POST['newmaint'] == 1 ? 1 : 0;
+		$debug = $_POST['newdebug'] == 1 ? 1 : 0;
+		$captcha = $_POST['newcaptcha'] == 1 ? 1 : 0;
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET tinyMCE = '$tinyMCE', favorites = '$favorites', multiplecats = '$multiplecats', allowed_tags = '$allowed_tags', newscomments = '$newscomments', logging = '$logging', maintenance = '$maintenance', debug = '$debug', captcha = '$captcha' WHERE sitekey ='".SITEKEY."'");
+	}
+	else if($sect == "display") {
+		$dateformat = $_POST['newdateformat'] ? descript(strip_tags($_POST['newdateformat'])) : descript(strip_tags($_POST['customdateformat']));
+		$timeformat = $_POST['newtimeformat'] ? descript(strip_tags($_POST['newtimeformat'])) : descript(strip_tags($_POST['customtimeformat']));
+		$extendcats = $_POST['newextendcats'] == 1 ? 1 : 0;
+		if(isset($_POST['newdisplaycolumns']) && isNumber($_POST['newdisplaycolumns'])) $displaycolumns = $_POST['newdisplaycolumns'];
+		if(isset($_POST['newitemsperpage']) && isNumber($_POST['newitemsperpage'])) $itemsperpage = $_POST['newitemsperpage'];
+		if(isset($_POST['newlinkstyle']) && isNumber($_POST['newlinkstyle'])) $linkstyle = $_POST['newlinkstyle'];
+		if(isset($_POST['newlinkrange']) && isNumber($_POST['newlinkrange'])) $linkrange = $_POST['newlinkrange'];
+		$displayindex = $_POST['newstoryindex'] == 1 ? 1 : 0;
+		$displayprofile = $_POST['newdisplayprofile'] == 1 ? 1 : 0;
+		$defaultsort = $_POST['newdefaultsort'] == 1 ? 1 : 0;
+		if(isNumber($_POST['newrecentdays'])) $recentdays = $_POST['newrecentdays'];
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET dateformat = '$dateformat', timeformat = '$timeformat', extendcats = '$extendcats', displaycolumns = '$displaycolumns', itemsperpage = '$itemsperpage', displayindex = '$displayindex', defaultsort = '$defaultsort', recentdays = '$recentdays', displayprofile = '$displayprofile', linkstyle = '$linkstyle', linkrange = '$linkrange' WHERE sitekey ='".SITEKEY."'");
+	}
+	else if($sect == "reviews") {
+		$reviewsallowed = $_POST['newreviewsallowed'] == 1 ? 1 : 0;
+		$anonreviews = $_POST['newanonreviews'] == 1 ? 1 : 0;
+		$rateonly = $_POST['newrateonly'] == 1 ? 1 : 0;
+		$ratings = isset($_POST['newratings']) && isNumber($_POST['newratings']) ? $_POST['newratings'] : 0;
+		$revdelete = isset($_POST['newrevdelete']) && isNumber($_POST['newrevdelete']) ? $_POST['newrevdelete'] : 0;
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET reviewsallowed = '$reviewsallowed', anonreviews = '$anonreviews', rateonly = '$rateonly', ratings = '$ratings', revdelete = '$revdelete' WHERE sitekey ='".SITEKEY."'");
+	}
+	else if($sect == "useropts") {
+		$alertson = $_POST['newalertson'] == 1 ? 1 : 0;
+		$disablepopups = $_POST['newdisablepops'] == 1 ? 1 : 0;
+		$agestatement  = $_POST['newagestatement'] == 1 ? 1 : 0;
+		$pwdsetting = $_POST['newpwdsetting'] == 1 ? 1 : 0;
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET alertson = '$alertson', disablepopups = '$disablepopups', agestatement = '$agestatement', pwdsetting = '$pwdsetting' WHERE sitekey ='".SITEKEY."'");
+	}
+	else if($sect == "email") {
+		$smtp_host = $_POST['newsmtp_host'];
+		$smtp_username = $_POST['newsmtp_username'];
+		$smtp_password = $_POST['newsmtp_password'];
+		$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET smtp_host = '$smtp_host', smtp_username = '$smtp_username', smtp_password = '$smtp_password' WHERE sitekey ='".SITEKEY."'");
+	}
+	if($result) {
+		$output .= write_message(_ACTIONSUCCESSFUL);
+		$sect = $sects[(array_search($sect, $sects) + 1)];
+		if(!$sect) $sect = $sects[0];
+	}
+	else $output .= write_error(_ERROR);
+}
+	$settingsresults = dbquery("SELECT * FROM ".$settingsprefix."fanfiction_settings WHERE sitekey ='".SITEKEY."'");
+	$settings = dbassoc($settingsresults);
+ 
+	foreach($settings as $var => $val) {
+		if(is_NULL($val)) $val = '';
+		$$var = stripslashes($val );
+	}
+
+	$output .= "<form method='POST' class='tblborder' style='' enctype='multipart/form-data' action='".($action == "settings" ? "admin.php?action=settings" : $_SERVER['PHP_SELF']."?step=".$_GET['step'])."&amp;sect=$sect'>";
+	if($sect == "main") {
+		$output .= "<h2>"._SITEINFO."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newsitekey'>"._SITEKEY.":</label></td><td><input type='text' class='textbox' name='newsitekey' value='".SITEKEY."'> <a href='#' class='pophelp'>[?]<span>"._HELP_SITEKEY."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newsitename'>"._SITENAME.":</label></td><td><input type='text' class='textbox' name='newsitename' value='".htmlspecialchars($sitename, ENT_QUOTES)."'> <a href='#' class='pophelp'>[?]<span>"._HELP_SITENAME."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newslogan'>"._SITESLOGAN.":</label></td><td><input type='text' class='textbox' name='newslogan' value='".htmlspecialchars($slogan, ENT_QUOTES)."'> <a href='#' class='pophelp'>[?]<span>"._HELP_SLOGAN."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newurl'>"._SITEURL.":</label></td><td><input type='text' class='textbox' name='newsiteurl' value='$url'> <a href='#' class='pophelp'>[?]<span>"._HELP_URL."</span></a></td>
+			</tr>
+			<tr>				
+				<td><label for='newtableprefix'>"._TABLEPREFIX.":</label></td><td><input type='text' class='textbox' name='newtableprefix' value='".TABLEPREFIX."'> <a href='#' class='pophelp'>[?]<span>"._HELP_TABLEPREFIX."</span></a></td>
+			</tr>
+			<tr>				
+				<td><label for='newsiteemail'>"._ADMINEMAIL.":</label></td><td><input type='text' class='textbox' name='newsiteemail' value='$siteemail'> <a href='#' class='pophelp'>[?]<span>"._HELP_SITEEMAIL."</span></a></td>
+			</tr>
+			<tr>				
+				<td><label for='newsiteskin'>"._DEFAULTSKIN.":</label></td><td><select name='newskin'>";
+		$directory = opendir(_BASEDIR."skins");
+		while($filename = readdir($directory)) {
+			if($filename=="." || $filename==".." || !is_dir(_BASEDIR."skins/".$filename)) continue;
+			$output .= "<option value='$filename'".($skin == $filename ? " selected" : "").">$filename</option>";
+		}
+		closedir($directory);
+		$output .= "</select> <a href='#' class='pophelp'>[?]<span>"._HELP_SITESKIN."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newlanguage'>"._LANGUAGE.":</label></td><td><select name='newlanguage'>";
+		$directory = opendir(_BASEDIR."languages");
+			while($filename = readdir($directory)) {
+				if($filename=="." || $filename==".." || substr($filename, 2) == "_admin.php") continue;
+				$output .= "<option value='".substr($filename, 0, 2)."'".
+					($language == substr($filename, 0, strpos($filename, ".php")) ? " selected" : "").">
+				".substr($filename, 0, strpos($filename, ".php"))."</option>";
+			}
+		closedir($directory);
+		$output .= "</select> <a href='#' class='pophelp'>[?]<span>"._HELP_LANGUAGE."</span></a></td></tr>";
+	}
+	else if($sect == "submissions") {
+		$output .= "<h2>"._SUBMISSIONSETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newsubmissionsoff'>"._NOSUBS.":</label></td><td><select name='newsubmissionsoff'>
+				<option value='1'".($submissionsoff == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($submissionsoff == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_SUBSOFF."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newautovalidate'>"._AUTOVALIDATE.":</label></td><td><select name='newautovalidate'>
+				<option value='1'".($autovalidate == "1" ? "selected" : "").">"._YES."</option>
+				<option value='0'".($autovalidate == "0" ? "selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_AUTOVALIDATE."</span></a></td>
+			</tr>		
+			<tr>
+				<td><label for='newcoauthallowed'>"._COAUTHALLOW.":</label></td><td><select name='newcoauthallowed'>
+				<option value='1'".($coauthallowed == "1" ? "selected" : "").">"._YES."</option>
+				<option value='0'".($coauthallowed == "0" ? "selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_COAUTHORS."</span></a></td>
+			</tr>			
+			<tr>
+				<td><label for='newroundrobins'>"._ALLOWRR.":</label></td><td><select name='newroundrobins'>
+				<option value='1'".($roundrobins == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($roundrobins == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_ROUNDROBINS."</span></a></td>
+			</tr>			
+			<tr>
+				<td><label for='newallowseries'>"._ALLOWSERIES.":</label></td><td><select name='newallowseries'>
+				<option value='2'".($allowseries == "2" ? " selected" : "").">"._ALLMEMBERS."</option>
+				<option value='1'".($allowseries == "1" ? " selected" : "").">"._AUTHORSONLY."</option>
+				<option value='0'".($allowseries == "0" ? " selected" : "").">"._ADMINS."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_ALLOWSERIES."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newimageupload'>"._IMAGEUPLOAD.":</label></td><td><select name='newimageupload'>
+				<option value='1'".($imageupload == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($imageupload == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_IMAGEUPLOAD."</span></a></td>
+			</tr>
+			<tr>
+				<td colspan='2'><fieldset style='margin: 0 auto;'><legend>"._IMAGESIZE." <a href='#' class='pophelp'>[?]<span>"._HELP_IMAGESIZE."</span></a></legend>
+				<label for='newimageheight'>"._MAXHEIGHT.":</label> <input  type='text' class='textbox=' name='newimageheight' value='$imageheight' size='5'> <br />
+				<label for='newimagewidth'>"._MAXWIDTH.":</label> <input  type='text' class='textbox=' name='newimagewidth' value='$imagewidth' size='5'></fieldset></td>
+			</tr>
+			<tr>
+				<td><label for='newstore'>"._HOWSTORE.":</label></td><td><select name='newstore' onChange='if (this.disabled) this.selectedIndex=0' disabled>
+					<option value='files'".($store == "files" || !$store ? " selected" : "").">"._FILES."</option>
+					<option value='mysql'".($store == "mysql" ? " selected" : "").">"._MYSQL."</option>
+					</select> <input class='textbox=' type='checkbox' class='checkbox' name='r1' onClick='this.form.newstore.disabled=false' checked> <a href='#' class='pophelp'>[?]<span>"._HELP_STORE."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newstoriespath'>"._STORIESPATH.":</label></td><td><input type='text' class='textbox=' name='newstoriespath' value='$storiespath'> <a href='#' class='pophelp'>[?]<span>"._HELP_STORIESPATH."</span></a></td>
+			</tr>
+			<tr>
+				<td colspan='2'><fieldset style='margin: 0 auto;'><legend>"._MAXMINWORDS."<a href='#' class='pophelp'>[?]<span>"._HELP_MINMAXWORDS."</span></a></legend>
+				<label for='newminwords'>"._MIN.":</label> <input  type='text' class='textbox=' name='newminwords' value='$minwords' size='5'> <br />
+				<label for='newmaxwords'>"._MAX.":</label> <input  type='text' class='textbox=' name='newmaxwords' value='$maxwords' size='7'></fieldset></td></tr>";
+	}
+	else if($sect == "sitesettings") {
+		$output .= "<h2>"._SITESETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newtinyMCE'>"._USETINYMCE. ": </label></td><td><select name='newtinyMCE'>
+				<option value=\"2\"" . ($tinyMCE == 2 ? " selected" : "") . ">TinyMce4</option>
+				<option value=\"1\"" . ($tinyMCE == 1 ? " selected" : "") . ">TinyMce3</option>
+				<option value=\"0\"" . (!$tinyMCE ? " selected" : "") . ">" . _NO . "</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_TINYMCE." "._TINYMCENOTE."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newallowed_tags'>"._TAGS.": </label></td><td><input type='text' class='textbox'  name='newallowed_tags' value='".($allowed_tags ? $allowed_tags : "<strong><em><br /><br><blockquote><strike><font><b><i><u><center><img><a><hr><p><ul><li><ol>")."' size='40'> <a href='#' class='pophelp'>[?]<span>"._HELP_ALLOWEDTAGS." "._TINYMCENOTE."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newfavorites'>"._FAVORITES.": </label></td><td><select name='newfavorites'>
+				<option value='1'".($favorites == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($favorites == "0" ? " selected" : "").">"._NO."</option>
+				</select><a href='#' class='pophelp'>[?]<span>"._HELP_FAVORITES."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newmultplecats'>"._NUMCATS.": </label></td><td><select name='newmultiplecats'>
+				<option value='1'".($multiplecats == "1" ? "selected" : "").">"._MORETHANONE."</option>
+				<option value='0'".($multiplecats == "0" ? "selected" : "").">"._ONLYONE."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_NUMCATS."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newnewscomments'>"._NEWSCOMMENTS.": </label></td><td><select name='newnewscomments'>
+				<option value='1'".($newscomments == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($newscomments == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_NEWSCOMMENTS."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newlogging'>"._LOGGING.": </label></td><td><select name='newlogging'>
+				<option value='1'".($logging == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($logging == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_LOGGING."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newmaint'>"._MAINTENANCE.": </label></td><td><select name='newmaint'>
+				<option value='1'".($maintenance == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($maintenance == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_MAINTENANCE."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newdebug'>"._DEBUG.": </label></td><td><select name='newdebug'>
+				<option value='1'".($debug == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!isset($debug) || $debug == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_DEBUG."</span></a></td>
+			</tr>
+			<tr>
+				<td><label for='newcaptcha'>"._CAPTCHA.": </label></td><td><select name='newcaptcha'>
+				<option value='1'".($captcha == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!isset($captcha) || $captcha == "0" ? " selected" : "").">"._NO."</option>
+				</select><a href='#' class='pophelp'>[?]<span>"._HELP_CAPTCHA."</span></a></td></tr>";
+	}
+	else if($sect == "display") {
+		$settings = dbquery("SELECT defaultsort, displayindex FROM ".$settingsprefix."fanfiction_settings WHERE sitekey ='".SITEKEY."'");
+		list($sitedefaultsort, $sitedisplayindex) = dbrow($settings);
+		$defaultdates = array("m/d/y", "m/d/Y", "m/d/Y", "d/m/Y", "d/m/y", "d M Y", 
+				"d.m.y", "Y.m.d", "m.d.Y", "d-m-y", "m-d-y", "M d Y", "M d, Y", "F d Y", "F d, Y");
+		$defaulttimes = array("h:i a", "h:i A", "H:i", "g:i a", "g:i A", "G:i", "h:i:s a", "H:i:s", "g:i:s a", "g:i:s A", "G:i:s");
+		$output .= "<h2>"._DISPLAYSETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newdateformat'>"._DATEFORMAT.":</label></td><td><select name='newdateformat'><option value=''>"._SELECTONE."</option>";
+		foreach($defaultdates as $date) {
+			$output .= "<option value='$date'>".date("$date")."</option>";
+		}
+		$output .= "</select> "._OR." <input type='text' name='customdateformat' class='textbox' value='$dateformat'> <a href='#' class='pophelp'>[?]<span>"._HELP_DATEFORMAT."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newtimeformat'>"._TIMEFORMAT.":</label></td><td><select name='newtimeformat'><option value=''>"._SELECTONE."</option>";
+		foreach($defaulttimes as $time) {
+			$output .= "<option value='$time'>".date("$time")."</option>";
+		}
+		$output .= "
+			</select> "._OR." <input type='text' name='customtimeformat' class='textbox' value='$timeformat'> <a href='#' class='pophelp'>[?]<span>"._HELP_TIMEFORMAT."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newextendcats'>"._EXTENDCATS.":</label></td><td><select name='newextendcats'>
+				<option value='1'".($extendcats == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($extendcats == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_EXTENDCATS."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newdisplaycolumns'>"._COLUMNS.":</label></td><td><input  type='text' class='textbox=' name='newdisplaycolumns' size='3' value='$displaycolumns'> <a href='#' class='pophelp'>[?]<span>"._HELP_COLUMNS."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newitemsperpage'>"._NUMITEMS.":</label></td><td><input  type='text' class='textbox' name='newitemsperpage' size='3' value='$itemsperpage'> <a href='#' class='pophelp'>[?]<span>"._HELP_ITEMSPERPAGE."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newrecentdays'>"._RECENTDAYS.":</label></td><td><input  type='text' class='textbox' name='newrecentdays' size='3' value='$recentdays'> <a href='#' class='pophelp'>[?]<span>"._HELP_RECENTDAYS."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newdefaultsort'>"._DEFAULTSORT.":</label></td><td><select name='newdefaultsort'>
+				<option value='1'".($sitedefaultsort ? " selected" : "").">"._MOSTRECENT."</option>
+				<option value='0'".(!$sitedefaultsort ? " selected" : "").">"._ALPHA."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_DEFAULTSORT."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newdisplayindex'>"._STORYINDEX.":</label></td><td><select name='newstoryindex'>
+				<option value='1'".($sitedisplayindex ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!$sitedisplayindex ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_DISPLAYINDEX."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newdisplayprofile'>"._DISPLAYPROFILE.":</label></td><td><select name='newdisplayprofile'>
+				<option value='1'".($displayprofile ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!$displayprofile ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_DISPLAYPROFILE."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newdisplayprofile'>"._LINKSTYLE.":</label></td><td><select name='newlinkstyle'>
+				<option value='2'".($linkstyle == 2 ? " selected" : "").">"._BOTHLINKSTYLE."</option>
+				<option value='1'".($linkstyle == 1 ? " selected" : "").">"._FIRSTLAST."</option>
+				<option value='0'".(!$linkstyle ? " selected" : "").">"._NEXTPREV."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_LINKSTYLE."</span></a></td>
+		</tr>
+		<tr>
+			<td><label for='newlinkrange'>"._LINKRANGE.":</label></td><td><input  type='text' class='textbox=' name='newlinkrange' size='3' value='$linkrange'> <a href='#' class='pophelp'>[?]<span>"._HELP_LINKRANGE."</span></a></td></tr>";
+	}
+	else if($sect == "reviews") {
+		$output .= "<h2>"._REVIEWSETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newreviewsallowed'>"._ONREVIEWS.":</label></td><td><select name='newreviewsallowed'>
+				<option value='1'".($reviewsallowed == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($reviewsallowed == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_REVIEWSON."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newanonreviews'>"._ANONREVIEWS.":</label></td><td><select name='newanonreviews'>
+				<option value='1'".($anonreviews == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($anonreviews == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_ANONREVIEWS."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newrevdelete'>"._REVDELETE.":</label></td><td><select name='newrevdelete'>
+				<option value='2'".($revdelete == 2 ? " selected" : "").">"._ALLREV."</option>
+				<option value='1'".($revdelete == 1 ? " selected" : "").">"._ANONREV."</option>
+				<option value='0'".(empty($revdelete) ? " selected" : "").">"._NONE."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_REVDELETE."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newratings'>"._WHATRATINGS.":</label></td><td><select name='newratings'>
+				<option value='2'".($ratings == "2" ? " selected" : "").">"._LIKESYS."</option>
+				<option value='1'".($ratings == "1" ? " selected" : "").">"._STARS."</option>
+				<option value='0'".($ratings == "0" ? " selected" : "").">"._NONE."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_RATINGS."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newrateonly'>"._ALLOWRATEONLY.":</label></td><td><select name='newrateonly'>
+				<option value='1'".($rateonly == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($rateonly == "0" ? " selected" : "").">"._NO."</option>
+				</select> <a href='#' class='pophelp'>[?]<span>"._HELP_RATEONLY."</span></a></td></tr>";
+	}
+	else if($sect == "useropts") {
+		$output .= "<h2>"._USERSETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newalertson'>"._ALERTSON.":</label></td><td><select name='newalertson'>
+				<option value='1'".($alertson == "1" ? " selected" : "").">"._YES."</option>
+				<option value='0'".($alertson == "0" ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_ALERTSON."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newdisablepops'>"._USERPOPS.":</label></td><td><select name='newdisablepops'>
+				<option value='1'".($disablepopups ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!$disablepopups ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_POPUPS."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newagestatement'>"._AGESTATEMENT.":</label></td><td><select name='newagestatement'>
+				<option value='1'".($agestatement ? " selected" : "").">"._YES."</option>
+				<option value='0'".(!$agestatement ? " selected" : "").">"._NO."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_AGECONSENT."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newpwdsetting'>"._PWDSETTING.":</label></td><td><select name='newpwdsetting'>
+				<option value='1'".($pwdsetting ? " selected" : "").">"._SELF."</option>
+				<option value='0'".(!$pwdsetting ? " selected" : "").">"._RANDOM."</option>
+			</select> <a href='#' class='pophelp'>[?]<span>"._HELP_PWD."</span></a></td></tr>";
+	}
+	else if($sect == "email") {
+		$output .= "<h2>"._EMAILSETTINGS."</h2>
+		<table class='acp'>
+			<tr>
+				<td><label for='newsmtp_host'>"._SMTPHOST.":</label></td><td><input name='newsmtp_host' type='text' value='$smtp_host'> <a href='#' class='pophelp'>[?]<span>"._HELP_SMTPHOST."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newsmtp_username'>"._SMTPUSER.":</label></td><td><input name='newsmtp_username' type='text' value='$smtp_username'> <a href='#' class='pophelp'>[?]<span>"._HELP_SMTPUSER."</span></a></td>
+		</tr>
+		<tr>
+				<td><label for='newsmtp_password'>"._SMTPPASS.":</label></td><td><input name='newsmtp_password' type='password' value='$smtp_password'> <a href='#' class='pophelp'>[?]<span>"._HELP_SMTPPWD."</span></a></td></tr>";		
+		$output .= 	write_message(_SMTPOFF);
+	}
+	$output .= "<tr><td colspan='2'><div align='center'><input type='submit' id='submit' class='button' name='submit' value='"._SUBMIT."'></div></form></td></tr></table>";
+?>

--- /dev/null
+++ b/admin/skins.php
@@ -1,1 +1,51 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$output .= "<div class='sectionheader'>"._HIDDENSKINS."</div>";
+
+if(isset($_POST['submit'])) {
+	$hiddenskins = isset($_POST['hiddenskins']) ? implode(",", $_POST['hiddenskins']) : "";
+	$result = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET hiddenskins = '$hiddenskins' WHERE sitekey ='".SITEKEY."' LIMIT 1");
+	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+	else $output .= write_error(_ERROR);
+}
+else {
+	$directory = opendir(_BASEDIR."skins");
+	if(!isset($hiddenskins)) $hiddenskins = array( );
+	if(is_string($hiddenskins)) $hiddenskins = explode(",", $hiddenskins);
+	while($filename = readdir($directory)) {
+		if($filename== "." || $filename== ".." || !is_dir(_BASEDIR."skins/".$filename)) continue;
+		$skinlist[strtolower($filename)] = "<input type='checkbox' value='$filename' name='hiddenskins[]' id='hiddenskins'".(is_array($hiddenskins) && in_array($filename, $hiddenskins) ? " checked" : "")."> $filename<br />\n";
+	}
+	ksort($skinlist);
+	$output .= "<div><form method=\"POST\" style='width: 250px; margin: 1em auto;' class='tblborder' name=\"form\" enctype=\"multipart/form-data\" action=\"admin.php?action=skins\">";
+	foreach($skinlist as $s) { $output .= $s; }
+	unset($skinlist, $s);
+	closedir($directory);
+	$output .= "<INPUT type=\"submit\" class=\"button\" style='display: block; margin: 1ex auto;' id=\"submit\" value=\""._SUBMIT."\" name=\"submit\"></form></div>";
+	$output .= write_message(_HIDDENNOTE);
+}
+?>

--- /dev/null
+++ b/admin/stories.php
@@ -1,1 +1,241 @@
-
+<?php
+
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+function featured( ) {
+	global $tableprefix, $dbconnect;
+
+	if($_GET['retire'])
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 2 WHERE sid = ".$_GET['retire']);
+	if($_GET['feature'])
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET featured = 1 WHERE sid = ".$_GET['feature']);
+	$fquery = "SELECT stories.*, stories.title as title, author.penname, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '%Y.%m.%d') as updatesort, DATE_FORMAT(stories.date, '$datim') as date, DATE_FORMAT(FROM_UNIXTIME(stories.updated), '$datim') as updated FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as stories WHERE stories.featured > 0 AND stories.uid = author.uid ORDER BY stories.featured";
+	$fresult = dbquery($fquery) or die(_FATALERROR."Query: ".$fquery."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);
+	$output = "<center><table class=\"tblborder\" cellpadding=\"5\"><tr><th colspan=\"2\" align=\"center\">"._FEATUREDSTORIES."</th></tr>";
+	if(!dbnumrows($fresult)) $output .= "<tr><td colspan=\"2\" align=\"center\">"._NOSTORIES."</td><tr>";
+	while($story = dbassoc($fresult)) {
+		$output .= "<tr><td class=\"tblborder\"><a href=\"viewstory.php?sid=".$story['sid']."\">$story[title]</a> "._BY." <a href=\"viewuser.php?uid=".$story['uid']."\">".$story['penname']."</a></td><td class=\"tblborder\" align=\"center\">".($story['featured'] == 1 ? "<a href=\"admin.php?action=featured&retire=".$story['sid']."\">"._CURRENT."</a>" : "<b>"._RETIRED."</b>")."</td></tr>";
+	}
+	$output .= "</table>"._FEATUREDNOTE;
+	return $output;
+}
+// end featured
+
+function submitted()
+{
+	global $tableprefix, $admincats, $allowed_tags, $dbconnect;
+		$output = "<center><h4>"._SUBMITTED."</h4></center>";
+		$query = "SELECT story.title as storytitle, chapter.uid, chapter.sid, story.catid, chapter.chapid, chapter.inorder, chapter.title, author.penname FROM (".TABLEPREFIX."fanfiction_chapters as chapter, ".TABLEPREFIX."fanfiction_authors as author) LEFT JOIN ".TABLEPREFIX."fanfiction_stories as story ON story.sid = chapter.sid WHERE chapter.validated = '0' AND chapter.uid = author.uid ORDER BY story.title ASC, chapter.inorder ASC";
+		$result = dbquery($query) or die(_FATALERROR."Query: ".$query."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);
+		$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" align=\"center\"><tr class=\"tblborder\"><th>"._TITLE."</th><th>"._AUTHOR."</th><th>"._CATEGORY."</th><th>"._OPTIONS."</th></tr>";
+		$array = explode(",", $admincats);
+		while ($story = dbassoc($result))
+		{
+			unset($catstring);
+			$result3 = dbquery("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");
+			while($cats = dbassoc($result3)) {
+				$catstring[] = "<a href=\"categories.php?catid=".$cats['catid']."\">".$cats['category']."</a>";
+			}
+			if(!$admincats || sizeof(array_intersect(explode(",", $story['catid']), explode(",", $admincats)))) {
+				$output .= "<tr class=\"tblborder\">";
+				$output .= "<td class=\"tblborder\"><a href=\"viewstory.php?sid=".$story['sid']."\">".$story['storytitle']."</a>";
+				if($story['title']) $output .= " <b>:</b> <a href=\"viewstory.php?sid=".$story['sid']."&amp;chapter=".$story['inorder']."\">".$story['title']."</a>";
+				$output .= "<td class=\"tblborder\"><a href=\"viewuser.php?uid=".$story['uid']."\">".$story['penname']."</a></td>";
+				$output .= "<td class=\"tblborder\">".(is_array($catstring) ? implode(", ", $catstring) : "")."</td>";
+			$output .= "<td class=\"tblborder\"><a href=\"admin.php?action=validate&amp;chapid=".$story['chapid']."\">"._VALIDATE."</a> | "._DELETE.": <a href=\"stories.php?action=delete&amp;chapid=".$story['chapid']."&amp;sid=".$story['sid']."&amp;admin=1&amp;uid=".$story['uid']."\">"._CHAPTER."</a> "._OR." <a href=\"stories.php?action=delete&amp;sid=".$story['sid']."&amp;admin=1\">"._STORY."</a> | <a href=\"javascript:pop('admin.php?action=yesletter&uid=".$story['uid']."&chapid=".$story['chapid']."', 500, 400, 'yes')\">"._YESLETTER."</a> | <a href=\"javascript:pop('admin.php?action=noletter&uid=".$story['uid']."&chapid=".$story['chapid']."', 500, 400, 'yes')\">"._NOLETTER."</a></td></tr>";
+			}
+		}
+		$output .= "</table>";
+
+	return $output;
+}
+// end submitted function
+
+function validate( ) {
+	global $tableprefix, $level, $store, $storiespath, $allowed_tags, $admincats, $sitename, $siteemail, $url, $alertson;
+
+	$output  = "<center><h4>"._VIEWSUBMITTED."</h4></center>";
+	if($_GET['validate'] == "yes") {
+		$storyquery = dbquery("SELECT story.validated, story.catid, story.sid, story.title, story.summary, story.uid, author.penname, chapter.inorder FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters  as chapter, ".TABLEPREFIX."fanfiction_authors as author WHERE author.uid = story.uid AND chapter.sid = story.sid AND chapter.chapid ='".$_GET['chapid']."' LIMIT 1");
+		list($validated, $catid, $sid, $title, $summary, $authoruid, $author, $inorder) = dbassoc($storyquery);
+		if($admincats == "0" || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats)))) {
+			include("includes/emailer.php");
+			if($validated != "1") {
+				dbquery("UPDATE ".TABLEPREFIX. "fanfiction_stories SET validated = '1', updated = '".time()."' WHERE sid = '".$_GET['sid']."'");
+				$categories = explode(",", $catid);
+				include("functions.php");
+				foreach($categories as $cat) {
+					categoryitems($cat, 1);
+				}
+				if($alertson) {
+					$subject = _NEWSTORYAT;
+					$mailtext = sprintf(_AUTHORALERTNOTE, $title, $author, $summary, $sid);
+					$favorites = dbquery("SELECT author.uid, email, penname FROM ".TABLEPREFIX."fanfiction_favauth as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE fav.favuid = $authoruid AND fav.uid = author.uid");
+					while($favuser = dbassoc($favorites)) { 
+						sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");
+					}				
+				}
+			}
+			else if($alertson) {
+				$subject = _STORYALERT;
+				$mailtext = sprintf(_STORYALERTNOTE, $title, $author, $sid, $inorder);
+				$favorites = dbquery("SELECT author.uid, penname, email FROM ".TABLEPREFIX."fanfiction_favstor as fav, ".TABLEPREFIX."fanfiction_authors as author WHERE sid = '$sid' AND fav.uid = author.uid");
+				while($favuser = dbassoc($favorites)) { 
+					sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");
+				}
+			}
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '".$_GET['chapid']."'");
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");
+			$output .= "<center><b>"._STORYVALIDATED."</b></center>";
+		}
+		else
+			$output .= "<br /><br /><center>"._NOTAUTHORIZEDADMIN."  "._TRYAGAIN."</center><br /><br />";
+	}
+	else {
+			$result = dbquery("SELECT story.title as storytitle, story.sid, story.catid, story.rid, story.gid, story.charid, story.wid, story.summary as storysummary, chapter.chapid, chapter.title, chapter.storytext, author.penname, chapter.uid as uid FROM ".TABLEPREFIX."fanfiction_authors as author, ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid AND chapter.uid = author.uid");
+			$story = dbassoc($result);
+			$output .= "<b>"._AUTHOR.":</b> ".$story['penname']."<br />";
+			$output .= "<b>"._TITLE.":</b> ".$story['storytitle'].": ".$story['title'];
+			$output .= "<br />";
+			$result3 = dbquery("SELECT catid, category FROM ".TABLEPREFIX."fanfiction_categories WHERE FIND_IN_SET(catid, '".$story['catid']."')");
+			$catstring = "";
+			$count = 0;
+			while($cats = dbassoc($result3)) {
+				if($count > 0) $catstring .= ", ";
+				$catstring .= "<a href=\"categories.php?catid=".$cats['catid']."\">".$cats['category']."</a>";
+				$categories[] = $cats['catid'];
+				$count++;
+			}
+			$output .= "<b>"._CATEGORY.":</b> $catstring<br />";
+
+			$output .= "<b>"._GENRES.":</b> ".(isset($story['gid']) ? preg_replace("/,/", ", ", $story['gid']) : _NONE);
+			$output .= "<br />";
+			$output .= "<b>"._RATING.":</b> ".$story['rid']."<br />";
+			if($story['wid'] != "")
+			{
+				$output .= "<b>"._WARNINGS.":</b> ".(isset($story['wid']) ? preg_replace("/,/", ", ", $story['wid']) : _NONE);
+				$output .= "<br />";
+			}
+			$output .= "<b>"._CHARACTERS.":</b> ".$story['charid'];
+			$output .= "<br />";
+			$output .= "<b>"._SUMMARY.":</b> ".$story['storysummary']."<br />";
+			$output .= "<a href=\"admin.php?action=validate&amp;sid=".$story['sid']."&amp;chapid=".$story['chapid']."&amp;validate=yes\">"._VALIDATE."</a> | <a href=\"stories.php?action=editstory&amp;sid=$story[sid]&amp;admin=1\">"._EDIT." - "._STORY."</a> | <a href=\"stories.php?action=delete&amp;sid=$story[sid]\">"._DELETE." - "._STORY."</a> | <a href=\"javascript:pop('admin.php?action=yesletter&amp;uid=$story[uid]&amp;chapid=$story[chapid]', 400, 300, 'yes')\">"._YESLETTER."</a> | <a href=\"javascript:pop('admin.php?action=noletter&amp;uid=$story[uid]&amp;chapid=$story[chapid]',400, 300, 'yes')\">"._NOLETTER."</a><br />";
+			if($store == "files")
+			{
+				$file = "$storiespath/".$story['uid']."/".$story['chapid'].".txt";
+				$log_file = fopen($file, "r");
+				$file_contents = fread($log_file, filesize($file));
+				$storytext .= $file_contents;
+				fclose($log_file);
+			}
+			else if($store == "mysql")
+			{
+				$storytext .= $story['storytext'];
+			}
+			if(strpos($story, "<br>") === false && strpos($story, "<p>") === false && strpos($story, "<br />") === false) $storytext = nl2br($storytext);
+			$storytext = format_story($storytext, $allowed_tags);
+			$output .= $storytext;
+			$output .= "<br /><br />";
+			$output .= "<a href=\"admin.php?action=validate&amp;sid=".$story['sid']."&amp;chapid=".$story['chapid']."&amp;validate=yes\">"._VALIDATE."</a> | <a href=\"stories.php?action=editchapter&amp;chapid=".$story['chapid']."&amp;admin=1\">"._EDIT." - "._CHAPTER."</a> | <a href=\"stories.php?action=delete&amp;chapid=".$story['chapid']."&amp;sid=".$story['sid']."&amp;admin=1&amp;uid=".$story['uid']."\">"._DELETE." - "._CHAPTER."</a> | <a href=\"javascript:pop('admin.php?action=yesletter&amp;uid=".$story['uid']."&amp;chapid=".$story['chapid']."', 400, 300, 'yes')\">"._YESLETTER."</a> | <a href=\"javascript:pop('admin.php?action=noletter&amp;uid=".$story['uid']."&amp;chapid=".$story['chapid']."',400, 300, 'yes')\">"._NOLETTER."</a><br />";
+		}
+	return $output;
+}
+// end validate
+
+function yesletter( ) {
+	global $tableprefix, $level, $adminemail, $sitename, $siteemail, $allowed_tags;
+	
+	if($_POST['submit']) {
+
+		if($adminemail)
+			$ademail = $adminemail;
+		else 
+			$ademail = $siteemail;
+		$subject = stripinput($_POST['subject']);
+		$letter = nl2br(stripinput($_POST['letter']));
+			
+		include("includes/emailer.php");
+		$result = sendemail($_POST['email'], $_POST['email'], $adminname, $ademail, $subject, $letter, "html");
+
+		if($result) echo "<div style='text-align: center;'>"._EMAILSENT."</div>";
+		else echo "<div style='text-align: center;'>"._ERROR."</div>";
+	}
+	else {
+			$authorquery = dbquery("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");
+			$author = dbassoc($authorquery);
+			$storyquery = dbquery("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");
+			$story = dbassoc($storyquery);
+			$letter = file_get_contents("messages/thankyou.txt");
+			echo "<body>";
+			echo "<table><tr><td>Story:</td><td>".$story['title'].": ".$story['chapter']."</td></tr>";
+			echo "<tr><td>"._BY.":</td><td>".$author['penname']."</td></tr>";
+			echo "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=yesletter\">
+				<tr><td>To:</td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"email\" value=\"".$author['email']."\"></td></tr>
+				<tr><td>From:</td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"ademail\" value=\"$adminemail\"></td></tr>
+				<tr><td>Subject:</td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"subject\" value=\"Your Submission to $sitename\"></td></tr>
+				<tr><td colspan=\"2\"><textarea class=\"textbox\" name=\"letter\" cols=\"50\" rows=\"8\">$letter</TEXTAREA></td></tr><tr><td colspan=\"2\"><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></td></tr></table></body></html>";
+	}
+	exit( );
+}
+// end yesletter
+
+function noletter( ) {
+	global $tableprefix, $level, $adminemail, $sitename, $siteemail, $allowed_tags, $adminloggedin;
+	if($_POST['submit'])
+		{
+		if($adminemail)
+			$ademail = $adminemail;
+		else 
+			$ademail = $siteemail;
+		$subject = stripinput($_POST['subject']);
+		$letter = nl2br(stripinput($_POST['letter']));
+			
+		include("includes/emailer.php");
+		$result = sendemail($_POST['email'], $_POST['email'], $adminname, $ademail, $subject, $letter, "html");
+
+		if($result) echo "<div style='text-align: center;'>"._EMAILSENT."</div>";
+		else echo "<div style='text-align: center;'>"._ERROR."</div>";
+	}
+	else
+	{
+		$authorquery = dbquery("SELECT email,penname FROM ".TABLEPREFIX."fanfiction_authors WHERE uid = '".$_GET['uid']."' LIMIT 1");
+		$author = dbassoc($authorquery);
+		$storyquery = dbquery("SELECT story.title, chapter.title as chapter FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '".$_GET['chapid']."' AND chapter.sid = story.sid LIMIT 1");
+		$story = dbassoc($storyquery);
+		$letter = file_get_contents("messages/nothankyou.txt");
+		echo "<body>";
+		echo "<table><tr><td>Story:</td><td>".$story['title'].": ".$story['chapter']."</td></tr>";
+		echo "<tr><td>"._BY.":</td><td>".$author['penname']."</td></tr>";
+		echo "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=noletter\">
+			<tr><td>To:</td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"email\" value=\"".$author[email]."\"></td></tr>
+			<tr><td>From:</td><td><INPUT  type=\"text\" class=\"textbox=\" name=\"ademail\" value=\"$adminemail\"></td></tr>
+			<tr><td>Subject:</td><td><INPUT type=\"text\" class=\"textbox=\"  name=\"subject\" value=\"Your Submission to $sitename\"></td></tr>
+			<tr><td colspan=\"2\"><textarea class=\"textbox\" name=\"letter\" cols=\"50\" rows=\"8\">$letter</TEXTAREA></td></tr><tr><td colspan=\"2\"><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></td></tr></table></body></html>";
+	}
+	exit( );
+}
+// end noletter
+
+?>

--- /dev/null
+++ b/admin/submitted.php
@@ -1,1 +1,50 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+$output .= "<div id=\"pagetitle\">"._SUBMITTED."</div>";
+$view = isset($_GET['view']) ? $_GET['view'] : false;
+$output .= 	"<p style=\"text-align: right; margin: 1em;\"><a href=\"admin.php?action=submitted&amp;view=".($view == "all" ? "cats\">"._VIEWMYCATS : "all\">"._VIEWALL)."</a></p>";
+$result = dbquery("SELECT story.title as storytitle, chapter.uid, chapter.sid, story.catid, chapter.chapid, chapter.inorder, chapter.title, "._PENNAMEFIELD." as penname FROM (".TABLEPREFIX."fanfiction_chapters as chapter, "._AUTHORTABLE.") LEFT JOIN ".TABLEPREFIX."fanfiction_stories as story ON story.sid = chapter.sid WHERE chapter.validated = '0' AND chapter.uid = "._UIDFIELD." ORDER BY story.title");
+
+if(dbnumrows($result)) {
+	$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"0\" style=\"margin: 0 auto; width: 90%;\"><tr class=\"tblborder\"><th>"._TITLE."</th><th>"._AUTHOR."</th><th>"._CATEGORY."</th><th>"._OPTIONS."</th></tr>";
+	$array = explode(",", $admincats);
+	while ($story = dbassoc($result)) {
+		if(!$admincats || $_GET['view'] == "all" || sizeof(array_intersect(explode(",", $story['catid']), explode(",", $admincats)))) {
+			$output .= "<tr class=\"tblborder\">";
+			$output .= "<td class=\"tblborder\"><a href=\"viewstory.php?sid=$story[sid]\">".stripslashes($story['storytitle'])."</a>";
+			if(isset($story['title'])) $output .= " <b>:</b> <a href=\"viewstory.php?sid=$story[sid]&amp;chapter=$story[inorder]\">".stripslashes($story['title'])."</a>";
+			$output .= "<td class=\"tblborder\"><a href=\"viewuser.php?uid=$story[uid]\">$story[penname]</a></td>";
+			$output .= "<td class=\"tblborder\">".catlist($story['catid'])."</td>";
+			$output .= "<td class=\"tblborder\"><a href=\"admin.php?action=validate&amp;chapid=$story[chapid]\">"._VALIDATE."</a><br />"._DELETE.": <a href=\"stories.php?action=delete&amp;chapid=$story[chapid]&amp;sid=$story[sid]&amp;admin=1&amp;uid=$story[uid]\">"._CHAPTER."</a> "._OR." <a href=\"stories.php?action=delete&amp;sid=$story[sid]&amp;admin=1\">"._STORY."</a><br /><a href=\"javascript:pop('admin.php?action=yesletter&uid=$story[uid]&chapid=$story[chapid]', 500, 400, 'yes')\">"._YESLETTER."</a> | <a href=\"javascript:pop('admin.php?action=noletter&uid=$story[uid]&chapid=$story[chapid]', 500, 400, 'yes')\">"._NOLETTER."</a></td></tr>";
+		}
+	}
+	$output .= "</table>";
+}
+else $output .= write_message(_NORESULTS);
+?>

--- /dev/null
+++ b/admin/update.php
@@ -1,1 +1,137 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+$version = explode(".", $version);
+$confirm = isset($_GET['confirm']) ? $_GET['confirm'] : false;
+
+if($version[0] == 3 && $version[1] < 2) {
+if($confirm == "yes") {
+	// For the slow-pokes who haven't updated to 3.1
+	if($version[0] == 3 && $version[1] == 0 ) {
+		list($field) = dbrow(dbquery("SELECT field_id FROM ".TABLEPREFIX."fanfiction_authorfields WHERE field_name = 'betareader'"));
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorinfo SET info = '"._YES."' WHERE field = '$field' AND info = '1'");
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorinfo SET info = '"._NO."' WHERE field = '$field' AND info != '"._YES."'");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_authorinfo add primary key(uid,field);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_blocks drop index block_name;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_blocks add unique index block_name (block_name);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_categories drop index category;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_categories drop index parentcatid;");
+		dbquery("create index byparent on ".TABLEPREFIX."fanfiction_categories (parentcatid,displayorder);");
+		dbquery("create index forstoryblock on ".TABLEPREFIX."fanfiction_chapters (sid,validated);");
+		dbquery("create index byname on ".TABLEPREFIX."fanfiction_classes (class_type,class_name,class_id);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_classtypes drop index classtype_title;");
+		dbquery("create unique index classtype_name on ".TABLEPREFIX."fanfiction_classtypes(classtype_name);");
+		dbquery("create index code_type on ".TABLEPREFIX."fanfiction_codeblocks(code_type);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_comments drop index nid;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_comments add index commentlist (nid,time);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_favorites drop index uid;");
+		dbquery("create unique index byitem on ".TABLEPREFIX."fanfiction_favorites (item,type,uid);");
+		dbquery("create unique index byuid on ".TABLEPREFIX."fanfiction_favorites (uid,type,item);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_inseries drop index seriesid;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_inseries drop index inorder;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_inseries add index (seriesid,inorder);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_inseries drop index sid;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_inseries add primary key (sid,seriesid);");
+		dbquery("create index message_name on ".TABLEPREFIX."fanfiction_messages (message_name);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_pagelinks drop index link_text;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_panels drop index panel_hidden;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_panels drop index panel_type;");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_panels add index panel_type (panel_type,panel_name);");
+		dbquery("create index avgrating on ".TABLEPREFIX."fanfiction_reviews(type,item,rating);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_reviews drop index sid;");
+		dbquery("create index bychapter on ".TABLEPREFIX."fanfiction_reviews (chapid,rating);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_reviews add index byuid (uid,item,type);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_series drop index owner;");
+		dbquery("create index owner on ".TABLEPREFIX."fanfiction_series (uid,title);");
+		dbquery("alter table ".TABLEPREFIX."fanfiction_stories drop index validated;");
+		dbquery("create index validateduid on ".TABLEPREFIX."fanfiction_stories (validated,uid);");
+		dbquery("create index recent on ".TABLEPREFIX."fanfiction_stories (updated,validated);");
+		$alltables = dbquery("SHOW TABLES");
+	}
+	dbquery("CREATE TABLE `".TABLEPREFIX."fanfiction_stats` (
+  `sitekey` varchar(50) collate latin1_general_ci NOT NULL default '0',
+  `stories` int(11) NOT NULL default '0',
+  `chapters` int(11) NOT NULL default '0',
+  `series` int(11) NOT NULL default '0',
+  `reviews` int(11) NOT NULL default '0',
+  `wordcount` int(11) NOT NULL default '0',
+  `authors` int(11) NOT NULL default '0',
+  `members` int(11) NOT NULL default '0',
+  `reviewers` int(11) NOT NULL default '0',
+  `newestmember` int(11) NOT NULL default '0'
+) ENGINE=MyISAM");
+	dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_stats(`sitekey`) VALUES('".SITEKEY."')");
+	dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_inseries` DROP `updated`");
+	dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_news` ADD `comments` INT NOT NULL DEFAULT '0'");
+	dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_series` ADD `numstories` INT NOT NULL DEFAULT '0'");
+	dbquery("ALTER TABLE `".TABLEPREFIX."fanfiction_pagelinks` ADD `link_key` CHAR( 1 ) NULL AFTER `link_text`");
+	dbquery("ALTER TABLE `".$settingsprefix."fanfiction_settings` ADD `allowseries` TINYINT NOT NULL DEFAULT '2' AFTER `roundrobins`");
+	$serieslist = dbquery("SELECT seriesid FROM ".TABLEPREFIX."fanfiction_series");
+	while($s = dbassoc($serieslist)) {
+		$numstories = count(storiesInSeries($s['seriesid']));
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_series SET numstories = '$numstories' WHERE seriesid = ".$s['seriesid']." LIMIT 1");
+	}
+	$newslist = dbquery("SELECT count(cid) as count, nid FROM ".TABLEPREFIX."fanfiction_comments GROUP BY nid");
+	while($n = dbassoc($newslist)) {
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_news SET comments = '".$n['count']." WHERE nid = ".$n['nid']);
+	}
+
+	$storiesquery =dbquery("SELECT COUNT(sid) as totals, COUNT(DISTINCT uid) as totala, SUM(wordcount) as totalwords FROM ".TABLEPREFIX."fanfiction_stories WHERE validated > 0 ");
+	list($stories, $authors, $words) = dbrow($storiesquery);
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET stories = '$stories', authors = '$authors', wordcount = '$words' WHERE sitekey ='".SITEKEY."'"); 
+
+	$chapterquery = dbquery("SELECT COUNT(chapid) as chapters FROM ".TABLEPREFIX."fanfiction_chapters where validated > 0");
+	list($chapters) = dbrow($chapterquery);
+
+	$authorquery = dbquery("SELECT COUNT("._UIDFIELD.") as totalm FROM "._AUTHORTABLE);
+	list($members) = dbrow($authorquery);
+
+	$newest = dbrow(dbquery("SELECT "._UIDFIELD." as uid FROM "._AUTHORTABLE." ORDER BY "._UIDFIELD." DESC LIMIT 1"));
+	$reviewquery = dbquery("SELECT COUNT(reviewid) as totalr FROM ".TABLEPREFIX."fanfiction_reviews WHERE review != 'No Review'");
+	list($reviews) = dbrow($reviewquery);
+	$reviewquery = dbquery("SELECT COUNT(uid) FROM ".TABLEPREFIX."fanfiction_reviews WHERE review != 'No Review' AND uid != 0");
+	list($reviewers) = dbrow($reviewquery);
+	dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET chapters = '$chapters', members = '$members', newestmember = '$newest', reviews = '$reviews', reviewers = '$reviewers' WHERE sitekey ='".SITEKEY."'"); 
+	
+	$update = dbquery("UPDATE ".$settingsprefix."fanfiction_settings SET version = '3.2' WHERE sitekey ='".SITEKEY."'");
+	$alltables = dbquery("SHOW TABLES");
+	while ($table = dbassoc($alltables)) {
+		foreach ($table as $db => $tablename) {
+			dbquery("OPTIMIZE TABLE `".$tablename."`");
+		}
+	}
+	if($update) $output .= write_message(_ACTIONSUCCESSFUL);
+	else $output .= write_error(_ERROR);
+}
+else if($confirm == "no") {
+	$output .= write_message(_ACTIONCANCELLED);
+}
+else {
+  	$output .= write_message("This update will perform some tasks on the database to better your site's performance.  You are advised to back up your database before starting! <br />
+Are you ready to update? <a href='admin.php?action=maintenance&maint=update&amp;confirm=yes'>"._YES."</a> "._OR." <a href='admin.php?action=maintenance&maint=update&amp;confirm=no'>"._NO."</a>");
+}
+}
+else $output .= write_message(_ALREADYUPDATED);
+?>

--- /dev/null
+++ b/admin/validate.php
@@ -1,1 +1,151 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+function preview_story($stories) {
+	global $extendcats, $skindir, $catlist, $charlist, $store, $storiespath, $classlist, $featured, $retired, $rr, $reviewsallowed, $star, $halfstar, $ratingslist, $classtypelist, $dateformat, $recentdays, $current;
+		$count = 0;
+
+		if(isset($_GET['textsize'])) $textsize = $_GET['textsize'];
+		else $textsize = 0;
+		
+		if(file_exists("./$skindir/viewstory.tpl")) $tpl = new TemplatePower("./$skindir/viewstory.tpl");
+		else $tpl = new TemplatePower(_BASEDIR."default_tpls/viewstory.tpl");
+		$tpl->prepare( );			
+		include("includes/storyblock.php");
+		$adminlinks = "<div class=\"adminoptions\"><span class='label'>"._ADMINOPTIONS.":</span> <a href=\"admin.php?action=validate&amp;sid=$stories[sid]&amp;chapid=$stories[chapid]&amp;validate=yes\">"._VALIDATE."</a> | "._EDIT." - <a href=\"stories.php?action=editstory&amp;sid=$stories[sid]&amp;admin=1\">"._STORY."</a> "._OR." <a href=\"stories.php?action=editchapter&amp;chapid=$stories[chapid]&amp;admin=1\">"._CHAPTER."</a> | "._DELETE." - <a href=\"stories.php?action=delete&amp;sid=$stories[sid]\">"._STORY."</a> "._OR." <a href=\"stories.php?action=delete&amp;chapid=$stories[chapid]&amp;sid=$stories[sid]&amp;admin=1&amp;uid=$stories[uid]\">"._CHAPTER."</a> | <a href=\"javascript:pop('admin.php?action=yesletter&amp;uid=$stories[uid]&amp;chapid=$stories[chapid]', 400, 350, 'yes')\">"._YESLETTER."</a> | <a href=\"javascript:pop('admin.php?action=noletter&amp;uid=$stories[uid]&amp;chapid=$stories[chapid]',400, 350, 'yes')\">"._NOLETTER."</a></div>";
+		$tpl->assign("adminlinks", $adminlinks);
+		if($stories['inorder'] == 1 && !empty($stories['storynotes'])) {
+			$tpl->gotoBlock("_ROOT");
+			$tpl->newBlock("storynotes");
+			$tpl->assign( "storynotes", stripslashes($stories['storynotes']));
+			$tpl->gotoBlock("_ROOT");
+		}
+		if(!empty($stories['notes'])) {
+			$tpl->newBlock("notes");
+			$tpl->assign( "notes", $stories['notes']);
+			$tpl->gotoBlock("_ROOT");
+		}
+		if(!empty($stories['endnotes'])) {
+			$tpl->newBlock("endnotes");
+			$tpl->assign( "endnotes", $stories['endnotes']);
+			$tpl->gotoBlock("_ROOT");
+		}
+		if($store == "files")
+		{
+			$file = STORIESPATH."/$stories[uid]/$stories[chapid].txt";
+			$log_file = fopen($file, "r");
+			$file_contents = fread($log_file, filesize($file));
+			$storytext = $file_contents;
+			fclose($log_file);
+		}
+		else if($store == "mysql")
+		{
+			$storytext = $stories['storytext'];
+		}
+		$storytext = format_story($storytext);
+		$tpl->gotoBlock("_ROOT");
+		$tpl->assign("chaptertitle", $stories['chaptertitle']);
+		$tpl->assign("chapternumber", $stories['inorder']);
+		$tpl->assign( "story", "<span style=\"font-size: ".(100 + ($textsize * 20))."%;\">$storytext</span>" );
+		return $tpl->getOutputContent( );
+}
+
+	$output .= "<div id='pagetitle'>"._VIEWSUBMITTED."</div>";
+	if(isset($_GET['validate']) && $_GET['validate'] == "yes") {
+		$storyquery = dbquery("SELECT story.validated, story.catid, story.sid, story.title, story.summary, story.uid, "._PENNAMEFIELD." as penname, chapter.inorder, story.coauthors FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters  as chapter, "._AUTHORTABLE." WHERE "._UIDFIELD." = story.uid AND chapter.sid = story.sid AND chapter.chapid ='$_GET[chapid]' LIMIT 1");
+		list($storyvalid, $catid, $sid, $title, $summary, $authoruid, $author, $inorder, $coauthors) = dbrow($storyquery);
+		if(uLEVEL == 1 || (empty($admincats) || sizeof(array_intersect(explode(",", $catid), explode(",", $admincats))))) {
+			include("includes/emailer.php");
+			if(!$storyvalid) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET validated = '1', updated = '" . time() . "' WHERE sid = '$_GET[sid]'");
+				foreach(explode(",", $catid) as $cat) {
+					categoryitems($cat, 1);
+				}
+				$au[] = $authoruid;
+				if($coauthors == 1) {
+					$au = array();
+					$coauth = dbquery("SELECT "._PENNAMEFIELD." as penname, co.uid FROM ".TABLEPREFIX."fanfiction_coauthors AS co LEFT JOIN "._AUTHORTABLE." ON co.uid = "._UIDFIELD." WHERE co.sid = '".$_GET['sid']."'");
+					while($c = dbassoc($coauth)) {
+						$au[] = $c['uid'];
+					}
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET stories = stories + 1 WHERE FIND_IN_SET(uid, '".implode(",", $au)."') > 0");
+				}
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_authorprefs SET stories = stories + 1 WHERE uid = '$authoruid'");	
+				$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'addstory'");
+				while($code = dbassoc($codequery)) {
+					eval($code['code_text']);
+				}
+				if($alertson) {
+					if($au) $cond = " FIND_IN_SET(fav.item, '".implode(",", $au).",$authoruid') > 0";
+					else $cond = "fav.item = $authoruid";
+					$subject = _NEWSTORYAT." $sitename";
+					$mailtext = sprintf(_AUTHORALERTNOTE, $title, $author, $summary, $sid);
+					$favorites = dbquery("SELECT "._UIDFIELD." as uid, "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname, alertson FROM ".TABLEPREFIX."fanfiction_favorites as fav, ".TABLEPREFIX."fanfiction_authorprefs as ap, "._AUTHORTABLE." WHERE $cond AND fav.type = 'AU' AND fav.uid = "._UIDFIELD." AND ap.uid = "._UIDFIELD." AND ap.alertson = '1'");
+					while($favuser = dbassoc($favorites)) { 
+						sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");
+					}				
+				}
+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_STORY, USERPENNAME, USERUID, $title, $sid, $author, $authoruid))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS', " . time() . ")");
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET stories = stories + 1");
+			}
+			else if($alertson) {
+				$subject = _STORYALERT;
+				$mailtext = sprintf(_STORYALERTNOTE, $title, $author, $sid, $inorder);
+				$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'addchapter'");
+				while($code = dbassoc($codequery)) {
+					eval($code['code_text']);
+				}
+				$favorites = dbquery("SELECT "._UIDFIELD." as uid, "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname, alertson FROM ".TABLEPREFIX."fanfiction_favorites as fav, ".TABLEPREFIX."fanfiction_authorprefs as ap, "._AUTHORTABLE." WHERE fav.item = '$sid' AND fav.type = 'ST' AND fav.uid = "._UIDFIELD." AND ap.uid = "._UIDFIELD." AND ap.alertson = '1'");
+				while($favuser = dbassoc($favorites)) { 
+					sendemail($favuser['penname'], $favuser['email'], $sitename, $siteemail, $subject, $mailtext, "html");
+				}
+				if($logging) dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_log (`log_action`, `log_uid`, `log_ip`, `log_type`, `log_timestamp`) VALUES('".escapestring(sprintf(_LOG_VALIDATE_CHAPTER, USERPENNAME, USERUID, $title, $sid, $author, $authoruid, $inorder))."', '".USERUID."', INET_ATON('".$_SERVER['REMOTE_ADDR']."'), 'VS', " . time() . ")");
+			}
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_chapters SET validated = '1' WHERE chapid = '$_GET[chapid]'");
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET updated = '" . time() . "' WHERE sid = '$sid'");
+			$count =  dbquery("SELECT SUM(wordcount) as totalcount FROM ".TABLEPREFIX."fanfiction_chapters WHERE sid = '$sid' and validated = 1");
+			list($totalcount) = dbrow($count);
+			if($totalcount) {
+				dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET wordcount = '$totalcount' WHERE sid = '$sid'");
+			}
+			list($chapters, $words) = dbrow(dbquery("SELECT COUNT(chapid), SUM(wordcount) FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated = 1"));
+//			list($authors) = dbrow(dbquery("SELECT COUNT(DISTINCT uid) FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated > 0"));
+			list($authors) = dbrow(dbquery("SELECT COUNT(uid) FROM ".TABLEPREFIX."fanfiction_authorprefs WHERE stories > 0"));
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats set wordcount = '$words', chapters = '$chapters', authors = '$authors'");
+			$output .= write_message(_STORYVALIDATED);
+		}
+		else
+			$output .= write_error(_NOTAUTHORIZEDADMIN."  "._TRYAGAIN);
+	}
+	else {
+		if(isNumber($_GET['chapid'])) {
+			$result = dbquery("SELECT stories.*, stories.title as title, "._PENNAMEFIELD." as penname, stories.updated as updated, stories.date as date, chapter.uid as uid, chapter.inorder, chapter.title as chaptertitle, chapter.storytext, chapter.chapid, chapter.notes, chapter.endnotes FROM "._AUTHORTABLE.", ".TABLEPREFIX."fanfiction_stories as stories, ".TABLEPREFIX."fanfiction_chapters as chapter WHERE chapter.chapid = '$_GET[chapid]' AND chapter.sid = stories.sid AND chapter.uid = "._UIDFIELD);
+			$stories = dbassoc($result);
+			$output .= preview_story($stories);
+
+		}
+	}
+?>

--- /dev/null
+++ b/admin/versioncheck.php
@@ -1,1 +1,42 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+	$currentversion = "3.5.6";
+
+	$output .= "<div id=\"pagetitle\">"._VERSIONCHECK."</div>";
+
+ 
+	 $output .= write_message(_CURRENTVERSION. "$currentversion");
+
+	if ($currentversion != $version) {
+	$output .= write_message (_UPDATEVERSION);
+	}
+	else $output .= write_message (_UPTODATE);
+ 
+
+?>

--- /dev/null
+++ b/admin/viewlog.php
@@ -1,1 +1,64 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$logtypes = array("RG" => _NEWREG, "ED" => _ADMINEDIT, "DL" => _ADMINDELETE, "VS" => _VALIDATESTORY, "LP"=> _LOSTPASSWORD, "BL" => _BADLOGIN, "RE" => "Reviews", "AM" => "Admin Maintenance", "EB" => "Edit Bio");
+$typequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'logtype'");
+while($code = dbassoc($typequery)) {
+	eval($code['code_text']);
+}
+
+$type = isset($_GET['type']) ? $_GET['type'] : false;
+if(isset($_GET['purge'])) {
+	$result = dbquery("TRUNCATE ".TABLEPREFIX."fanfiction_log");
+	if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+}
+$output .= "<div id=\"pagetitle\">"._VIEWLOG."</div>";
+$output .= "<div style='text-align: center; margin: 1ex;'><form name=\"list\" action=\"\"><select name=\"list\" onchange=\"if(this.selectedIndex.value != 'false') document.location = document.list.list.options[document.list.list.selectedIndex].value\">";
+$logtypelist = dbquery("SELECT DISTINCT log_type FROM ".TABLEPREFIX."fanfiction_log ORDER BY log_type");
+$output .= "<option value=\"admin.php?action=viewlog\">"._ALL."</option>";
+while($t = dbrow($logtypelist)) {
+	$output .= "<option value='admin.php?action=viewlog&amp;type=$t[0]'".($type == $t[0] ? " selected" : "").">$t[0] - ".(isset($logtypes[$t[0]]) ? $logtypes[$t[0]] : "???")."</option>";
+}
+$output .= "</select></form></div>";
+$countquery = dbquery("SELECT COUNT(log_id) FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : ""));
+list($count) = dbrow($countquery);
+if($count > 0) {
+	$result = dbquery("SELECT log_action, INET_NTOA(log_ip) as log_ip,  log_timestamp as log_timestamp FROM ".TABLEPREFIX."fanfiction_log".($type ? " WHERE log_type = '$type'" : "")." ORDER BY log_timestamp DESC LIMIT $offset, $itemsperpage");
+	$output .= "<table class=\"tblborder\" cellspacing=\"0\" cellpadding=\"3\" style=\"width: 90%; margin: 0 auto;\"><tr class=\"tblborder\"><th>"._ACTION."</th><th>"._IP."</th><th>"._DATE."</th></tr>";
+	while ($item = dbassoc($result)) {
+			$output .= "<tr class=\"tblborder\">
+					<td class=\"tblborder\">".stripslashes($item['log_action'])."</td>
+					<td class=\"tblborder\">".$item['log_ip']."</td>
+					<td class=\"tblborder\">".date("$dateformat", $item['log_timestamp'])."</td>
+
+				    </tr>";
+	}
+	$output .= "</table>";
+	if($count > $itemsperpage) $output .= build_pagelinks("admin.php?action=viewlog".($type ? "&amp;type=$type&amp;" : "&amp;"), $count, $offset);
+}
+else $output .= write_message(_NORESULTS);
+$output .= write_message("<a href='admin.php?action=viewlog&amp;purge=1'>"._PURGELOG."</a>");
+?>

--- /dev/null
+++ b/admin/warnings.php
@@ -1,1 +1,109 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+function warnings( ) {
+	global $allowed_tags, $dbconnect;
+
+	$output = "<center><h4>"._WARNINGS."</h4></center>";
+	if($_GET["delete"]) {
+		$wid = $_GET["delete"];
+		if($_GET["confirm"] == "yes")
+		{
+			$result5 = dbquery("SELECT warning FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '$wid'");
+			$warnings = dbassoc($result5);
+			$newquery5 = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_stories WHERE FIND_IN_SET($wid, wid) > 1");
+				while($warningresult = dbassoc($newquery5))
+				{
+					$tok = strtok($warningresult['wid'], ", ");// tokenize the old list of names
+					$newString = "";// the new list of good names
+					while($tok)
+					{
+						if( $tok != $warnings['warning'] )// oldname is the thing that is going away
+						{
+							// It's a keeper, so decide if it is first or not for comma-age, then add it in
+							if( $newString != "" )
+								$newString .= ", ";
+							$newString .= $tok;
+						}
+						$tok = strtok(", "); //advance to the next token
+					}
+					dbquery("UPDATE ".TABLEPREFIX."fanfiction_stories SET wid = '$newString' WHERE sid = '".$warningresult['sid']."'");
+				}
+			dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_warnings where wid = '$wid'");
+			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+		}
+		else if ($_GET["confirm"] == "no")
+		{
+			$output .= "<center>"._ACTIONCANCELLED."</center>";
+		}
+		else
+		{
+			$output .= "<center>"._CONFIRMDELETE."<br /><br />";
+			$output .= "[ <a href=\"admin.php?action=warnings&delete=$wid&confirm=yes\">"._YES."</a> | <a href=\"admin.php?action=warnings&delete=$wid&confirm=no\">"._NO."</a> ]</center>";
+			return $output;
+		}
+	}
+	if ($_POST['submit']) {
+		if($_GET['warning'] == "new") dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(stripinput(strip_tags($_POST['warning'])))."')") or die(_FATALERROR."Query: INSERT INTO ".TABLEPREFIX."fanfiction_warnings (warning) VALUES ('".addslashes(strip_tags($_POST['warning']))."')<br />Error: (". $dbconnect->errno.") ".$dbconnect->error);
+		else dbquery("UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(stripinput(strip_tags($_POST['warning'])))."' WHERE wid = '".$_GET['warning']."'") or die(_FATALERROR."Query: UPDATE ".TABLEPREFIX."fanfiction_warnings set warning = '".addslashes(strip_tags($_POST['warnings']))."' WHERE wid = '".$_GET['warning']."'<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);
+			$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+	}
+	else {
+		if(isset($_GET['warning'])) {
+			if($_GET['warning'] != "new") {
+				$warnquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1") or die(_FATALERROR."Query: SELECT * FROM ".TABLEPREFIX."fanfiction_warnings WHERE wid = '".$_GET['warning']."' LIMIT 1<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);
+				$warning = dbassoc($warnquery);
+			}
+			$output .=  "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=warnings&warning=".$_GET['warning']."\">
+			<table align=\"center\">	<tr><td colspan=\"2\">	<b>".($_GET['warning'] == "new" ? _NEWWARNING : _EDITWARNING)."</b></td></tr>
+			<tr><td>"._WARNING.": <A HREF=\"javascript:pop('docs/adminhints.htm#warnings');\">[?]</A>
+			</td><td><INPUT  type=\"text\" class=\"textbox=\"  name=\"warning\" value=\"".$warning['warning']."\"></td></tr>
+			<tr><td colspan=\"2\"><INPUT type=\"submit\" class=\"button\" value=\""._SUBMIT."\" name=\"submit\"></td></tr></table></form>";
+		}
+		else {
+
+			$result = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_warnings");
+
+			//List of current warnings
+
+			$output .= "<table class=\"tblborder\" cellpadding=\"3\" cellspacing=\"0\" align=\"center\">
+			<tr><th colspan=\"2\" align=\"center\">"._WARNINGS."</th></tr>
+			<tr><td colspan=\"2\" align=\"center\" class=\"tblborder\"><a href=\"admin.php?action=warnings&warning=new\">"._ADDWARNING."</a></td></tr>";
+			while ($warningresults = dbassoc($result))
+			{
+				$output .=  "<tr><td class=\"tblborder\">".$warningresults['warning'];
+				$output .=  "</td><td class=\"tblborder\"><a href=\"admin.php?action=warnings&warning=".$warningresults['wid']."\">"._EDIT."</a> | <a href=\"admin.php?action=warnings&delete=".$warningresults['wid']."\">"._DELETE."</td></tr>";
+			}
+			$output .= "</table>";
+
+		}
+	}
+	return $output;
+}
+// end warnings function
+
+?>

--- /dev/null
+++ b/admin/yesletter.php
@@ -1,1 +1,62 @@
+<?php
+// ----------------------------------------------------------------------
+// eFiction 3.0
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(!defined("_CHARSET")) exit( );
+
+$chapid = isset($_GET['chapid']) && isNumber($_GET['chapid']) ? $_GET['chapid'] : 0;
+
+		$adminquery = dbquery("SELECT "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE "._UIDFIELD." = '".USERUID."' LIMIT 1");
+		list($adminemail, $adminname) = dbrow($adminquery);
+		if($adminemail)
+			$ademail = $adminemail;
+		else 
+			$ademail = $siteemail;
+	if(isset($_POST['submit'])) {
+		$subject = strip_tags(descript($_POST['subject']));
+		$letter = stripslashes(descript($_POST['letter']));
+		include("includes/emailer.php");
+		$result = sendemail($_POST['authorname'], $_POST['authoremail'], $adminname, $ademail, $subject, $letter, "html");
+		if($result) echo write_message(_EMAILSENT);
+		else echo write_error(_ERROR);
+	}
+	else {
+			$storyquery = dbquery("SELECT story.title, chapter.title as chapter, "._EMAILFIELD." as email, "._PENNAMEFIELD." as penname, chapter.uid FROM ".TABLEPREFIX."fanfiction_stories as story, ".TABLEPREFIX."fanfiction_chapters as chapter, "._AUTHORTABLE." WHERE chapter.uid = "._UIDFIELD." AND chapter.chapid = '$chapid' AND chapter.sid = story.sid LIMIT 1");
+			$story = dbassoc($storyquery);
+			$letterquery = dbquery("SELECT message_text, message_title FROM ".TABLEPREFIX."fanfiction_messages WHERE message_name = 'thankyou' LIMIT 1");
+			list($letter, $subject) = dbrow($letterquery);
+			$letter = stripslashes($letter);
+			$search = array("@\{sitename\}@", "@\{adminname\}@",  "@\{author\}@", "@\{storytitle\}@",  "@\{chaptertitle\}@", "@\{rules\}@");
+			$replace = array( $sitename, $adminname, $story['penname'], $story['title'], $story['chapter'], "<a href=\"$url/viewpage.php?id=rules\">"._RULES."</a>");
+			$letter = preg_replace($search, $replace, $letter);
+			$subject = preg_replace($search, $replace, $subject);
+			echo "<body>
+			<div id=\"pagetitle\"> $story[title]: $story[chapter] "._BY." $story[penname]</div>
+			<div style=\"line-height: 4ex; margin: 0 auto; width: 90%;\">
+				<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=yesletter&amp;uid=$story[uid]\">
+				<input type=\"hidden\" name=\"authoremail\" value=\"$story[email]\"><input type=\"hidden\" name=\"authorname\" value=\"story[penname]\">
+				<label for=\"subject\">"._SUBJECT.":</label> <INPUT type=\"text\" class=\"textbox=\" size=\"40\"  name=\"subject\" value=\"$subject\"><br />
+				<textarea  name=\"letter\" cols=\"40\" rows=\"7\">$letter</TEXTAREA><br /><INPUT type=\"submit\" style=\"margin: 10px;\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></div></body></html>";
+	}
+	exit( );
+?>

--- /dev/null
+++ b/authors.php
@@ -1,1 +1,90 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+if(isset($_GET['action']) && $_GET['action'] == "list") {
+	$current = "members";
+	$list = "members";
+}
+else if(isset($_GET['list']) && $_GET["list"] == "authors") $current = "authors";
+else $current = "members";
+
+include ("header.php");
+
+//make a new TemplatePower object
+if(file_exists("$skindir/default.tpl")) $tpl = new TemplatePower( "$skindir/default.tpl" );
+else $tpl = new TemplatePower("default_tpls/default.tpl");
+include("includes/pagesetup.php");
+
+// end basic page setup
+
+$pagetitle = "<div id=\"pagetitle\">";
+if(isset($_GET['list'])) $list = $_GET['list'];
+else $list = "members";
+if(!$let) {
+	$let = false;
+	$ptitle = "</div>";
+}
+else {
+	$ptitle = " -- $let</div>";
+	if($let == _OTHER) {
+		$letter = _PENNAMEFIELD." REGEXP '^[^a-z]'";
+	}
+	else{
+		$letter = _PENNAMEFIELD." LIKE '$let%'";
+	}
+}
+
+$listOpts = ""; $countquery = "";
+	if($list == "authors") {
+		$pagetitle .= _AUTHORS;
+		$authorquery = "SELECT "._PENNAMEFIELD." as penname, "._UIDFIELD." as uid, ap.stories FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON ap.uid = "._UIDFIELD." WHERE ap.stories > 0 ".(isset($letter) ? " AND $letter" : "")." GROUP BY "._UIDFIELD;
+		$countquery = "SELECT count("._UIDFIELD.") FROM "._AUTHORTABLE." LEFT JOIN ".TABLEPREFIX."fanfiction_authorprefs as ap ON "._UIDFIELD." = ap.uid WHERE ap.stories > 0 ".(isset($letter) ? " AND $letter" : "");
+	}
+	else if($list == "admins") {
+		$pagetitle .= _SITEADMINS;
+		$countquery = _MEMBERCOUNT." WHERE ap.level > 0 AND ap.level < 4".(isset($letter) ? " AND $letter" : "");
+		$authorquery = _MEMBERLIST." WHERE ap.level > 0 AND ap.level < 4".(isset($letter) ? " AND $letter" : "")." GROUP BY "._UIDFIELD;
+	}
+	$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'membersList'");
+	while($code = dbassoc($codequery)) {
+		eval($code['code_text']);
+	}
+	if(empty($countquery)) {
+		$pagetitle .= _MEMBERS;
+		$countquery = _MEMBERCOUNT.(isset($letter) ? " WHERE $letter" : "");
+		$authorquery = _MEMBERLIST.(isset($letter) ? " WHERE $letter" : "")." GROUP BY "._UIDFIELD;
+	}
+
+	$output .= $pagetitle.$ptitle;
+	$output .= "<div style=\"text-align: center;\"><form name=\"list\" action=\"\"><select name=\"list\" onchange=\"if(this.selectedIndex.value != 'false') document.location = document.list.list.options[document.list.list.selectedIndex].value\">";
+	$output .= "<option value=\"authors.php?".($let ? "let=$let&amp;" : "")."list=members\"".(empty($list) || $list == "members" ? " selected" : "").">"._ALLMEMBERS."</option>
+		<option value=\"authors.php?".($let ? "let=$let&amp;" : "")."list=authors\"".($list == "authors" ? " selected" : "").">"._AUTHORS."</option>
+		<option value=\"authors.php?".($let ? "let=$let&amp;" : "")."list=admins\"".($list == "admins" ? " selected" : "").">"._SITEADMINS."</option>$listOpts
+		</select></form></div>";
+	$pagelink="authors.php?list=".($list ? $list : "members")."&amp;".($let ? "let=$let&amp;" : "");
+	include("includes/members_list.php");
+
+	$tpl->assign( "output", $output );
+	$tpl->printToScreen();
+	dbclose( );
+?>

--- /dev/null
+++ b/blocks/categories/admin.php
@@ -1,1 +1,67 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+
+global $language;
+$content = "";
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'categories'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+if(empty($blocks['categories']['tpl'])) {
+	include("blocks/".$blocks['categories']['file']);
+	$tpl->gotoBlock("_ROOT");
+}
+if(file_exists("blocks/categories/{$language}.php")) include("blocks/categories/{$language}.php");
+else include("blocks/categories/en.php");
+	if(isset($_POST['submit'])) {
+		$blocks['categories']['columns'] = $_POST['columns'];
+		$blocks['categories']['template'] = $_POST['template'];
+		$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+		save_blocks( $blocks );
+	}
+	else  {
+		$template = (!empty($blocks['categories']['template']) ? $blocks['categories']['template'] : "{image} {link} [{count}] {description}"); 
+		if(empty($blocks['categories']['tpl'])) $output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 80%; margin: 0 auto; text-align: left;\">$content</div><br /></div>";
+		$output .= "<div><form method=\"POST\" id=\"settingsform\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=categories\">
+			<textarea name=\"template\" id=\"template\" rows=\"5\" cols=\"40\">$template</textarea><br />";
+		if($tinyMCE) 
+			$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('template');\"><label for='toggle'>"._TINYMCETOGGLE."</label></div>";	
+		$output .= "<select name=\"columns\" class=\"textbox\" style='margin: 3px;'><option value=\"0\"".(empty($blocks['categories']['columns']) ? " selected" : "").">"._ONECOLUMN."</option>
+					<option value=\"1\"".(!empty($blocks['categories']['columns']) ? " selected" : "").">"._MULTICOLUMN."</option></select> 
+			<select name=\"tpl\" class=\"textbox\" style='margin: 3px;'><option value=\"0\"".(empty($blocks['categories']['tpl']) ? " selected" : "").">"._DEFAULT."</option>
+					<option value=\"1\"".(!empty($blocks['categories']['tpl']) ? " selected" : "").">"._USETPL."</option></select><br />
+			<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form><div style='clear: both;'>&nbsp;</div>".write_message(_CATBLOCKNOTE)."</div>";
+	}
+?>

--- /dev/null
+++ b/blocks/categories/categories.php
@@ -1,1 +1,98 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+
+	if($multiplecats) {
+		$displaycolumns = $displaycolumns ? $displaycolumns : 1;
+		$query = "SELECT * FROM ".TABLEPREFIX."fanfiction_categories WHERE parentcatid = '-1' ORDER BY displayorder";
+		$result4 = dbquery($query) or die(_FATALERROR."Query: ".$query."<br />Error: (". $dbconnect->errno.") ". $dbconnect->error);
+		$total = dbnumrows($result4);
+		$count = 0;
+		$collist = array( );
+		if($total) {
+			if(!empty($blocks['categories']['tpl'])) {
+				while($categories = dbassoc($result4)) {
+					$list = floor($total / $displaycolumns);
+					if($total % $displaycolumns != 0) $list++;
+					$tpl->newBlock("categoriesblock");
+					if($categories['image'] && file_exists("$skindir/images/".$categories['image'])) $tpl->assign("categoryimage", "$skindir/images/".$categories['image']);
+					$tpl->assign("categorytitle", "<a href=\"browse.php?type=categories&amp;catid=".$categories['catid']."\">".$categories['category']."</a>");
+					$tpl->assign("numstories", "(".$categories['numitems'].")");
+					$tpl->assign("categorydescription", stripslashes($categories['description']));
+					$list--;
+					if($count % $displaycolumns == 0) {
+						$tpl->assign("categorycolumn", "</tr> ".($count < $list ? "<tr>" : ""));
+					}
+				}
+			}
+			else {
+				if(isset($blocks['categories']['columns']) && empty($blocks['categories']['columns'])) $catcolumns = 1;
+				else $catcolumns = $displaycolumns;
+				$colcount = floor(($total / $catcolumns) + ($total % $catcolumns ? 1 : 0));
+				$mod = $total % $catcolumns;
+				$col = 0;
+				$count = 0;
+				$template = (!empty($blocks['categories']['template']) ? stripslashes($blocks['categories']['template']) : "{image} {link} [{count}] {description}"); 
+				$search = array("@\{image\}@", "@\{link\}@", "@\{count\}@", "@\{description\}@");
+				while($categories = dbassoc($result4)) {
+					unset($catinfo);
+					$count++;
+					$replace = array(
+						(!empty($categories['image']) && file_exists("$skindir/images/".$categories['image']) ? "<img src=\"$skindir/images/".$categories['image']."\" alt=\"".$categories['category']."\" title=\"".$categories['category']."\">" : ""),
+						"<a href=\"browse.php?type=categories&amp;catid=".$categories['catid']."\">".$categories['category']."</a>", $categories['numitems'], stripslashes($categories['description']));
+					$catinfo = preg_replace($search, $replace, $template);
+					if($catcolumns == 1) $collist[] = $catinfo;
+					else $collist[$col][] = $catinfo;
+					if(($mod && $col < $mod && $count == $colcount) || ($mod && $col >= $mod && $count >= ($colcount - 1)) || (!$mod && $count == $colcount)) {
+						$col++;
+						$count = 0;
+					}
+				}
+				if($catcolumns > 1) {
+					$content .= "<div id=\"categoryblock\"><div><div id=\"browseblock\">";
+					$col = 0;
+					for($a = 0; $a < $colcount; $a++) {
+						$content .= "<div class=\"row\">";
+						foreach($collist as $c) {
+							if(isset($c[$a])) $content .= "<div class=\"column\">".$c[$a]."</div>";
+						}
+						$content .= "<div class=\"cleaner\">&nbsp;</div></div>";
+					}
+					$content .= "</div><div>&nbsp;</div></div></div>";
+				}
+				else {
+					$content .= "<div id=\"categoryblock\">";
+					foreach($collist as $c) {
+						$content .= "<div class=\"row\">".$c."</div>";
+					}
+					$content .= "</div>";
+				}
+			}
+		}
+	}
+?>

--- /dev/null
+++ b/blocks/categories/en.php
@@ -1,1 +1,32 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_ONECOLUMN", "One Column List");
+define("_MULTICOLUMN", "Multiple Columns");
+define("_CATBLOCKNOTE", "Note: Selecting 'Use .tpl' will output the categories blocks in the 1.1 table format.");
+?>

--- /dev/null
+++ b/blocks/categories/index.php

--- /dev/null
+++ b/blocks/categories/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+$blocks["categories"] = array("title" => "Main Categories", "status" => "0", "file" => "categories/categories.php");
+?>

--- /dev/null
+++ b/blocks/countdown/README.txt
@@ -1,1 +1,38 @@
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Countdown Block developed for eFiction 3.x
+// http://efiction.hugosnebula.com/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+
+To install this block:
+
+1. Upload the countdown folder to the blocks folder of your eFiction site.
+
+2. Goto Admin->Blocks.
+
+3. Select "Initialize Block" next to the countdown block in te list.
+
+
+To Administer this block:
+
+1. Goto Admin->Blocks.
+
+2. Select "Options" for the countdown block in the list.
+
+3. Enter the requested information in the admin panel and click "Submit."
+

--- /dev/null
+++ b/blocks/countdown/admin.php
@@ -1,1 +1,34 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language, $numupdated;
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'countdown'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+include("blocks/countdown/block.php");
+	if(isset($_POST['submit'])) {
+		if(!empty($_POST['target'])) $blocks['countdown']['target'] = escapestring($_POST['target']);
+		else unset($blocks['countdown']['target']);
+		if(!empty($_POST['CDformat'])) $blocks['countdown']['CDformat'] = escapestring($_POST['CDformat']);
+		else unset($blocks['countdown']['CDformat']);
+		if(!empty($_POST['finish'])) $blocks['countdown']['CDfinal'] = escapestring($_POST['finish']);
+		else unset($blocks['countdown']['CDfinal']);
+		$output .= "<div style='text-align: center;'>"._ACTIONSUCCESSFUL."</div>";
+		save_blocks( $blocks );
+	}
+	else  {
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 80%; margin: 0 auto; text-align: left;\">".$content."</div><br /></div>";
+		$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&amp;admin=countdown\">
+			<div><label for=\"target\">"._TARGETDATE.":</label><input type=\"text\" class=\"textbox\" name=\"target\" id=\"target\" value=\"".(!empty($blocks['countdown']['target']) ? $blocks['countdown']['target'] : date("m/d/Y G:H"))."\"></div>
+			<div><label for=\"CDformat\">"._FORMATCOUNT.":</label><input type=\"text\" class=\"textbox\" name=\"CDformat\" id=\"CDformat\" size=\"40\" value=\"".(empty($blocks['countdown']['CDformat']) ? _COUNTDOWNFORMAT : $blocks['countdown']['CDformat'])."\"></div>
+			<div><label for=\"finish\">"._FINISHMESSAGE.":</label><input type=\"text\" class=\"textbox\" name=\"finish\" id=\"finish\" size=\"40\" value=\"".(empty($blocks['countdown']['finish']) ? _COUNTDOWNOVER : $blocks['countdown']['finish'])."\"></div>
+			<INPUT type=\"submit\" name=\"submit\" class=\"button\" id=\"submit\" value=\""._SUBMIT."\"></form></div><div style='text-align: center;'>"._DATENOTE."</div>";
+	}
+?>

--- /dev/null
+++ b/blocks/countdown/block.php
@@ -1,1 +1,55 @@
+<?php
+if(!defined("_CHARSET")) exit( );
+if(file_exists(_BASEDIR."blocks/countdown/".$language.".php")) include(_BASEDIR."blocks/countdown/".$language.".php");
+else include(_BASEDIR."blocks/countdown/en.php");
 
+if(empty($blocks['countdown']['target'])) {
+	$content = _NOCOUNTDOWN;
+}
+else { 
+$target = $blocks['countdown']['target'];
+if(empty($blocks['countdown']['CDformat'])) $CDformat = _COUNTDOWNFORMAT;
+else $CDformat = $blocks['countdown']['CDformat'];
+if(empty($blocks['countdown']['CDfinal'])) $CDfinal = _COUNTDOWNOVER;
+else $CDfinal = $blocks['countdown']['CDfinal'];
+
+	$content = '<span id="countdown"></span>
+<script language="JavaScript" type="text/javascript">
+
+TargetDate = "'.$target.'";
+DisplayFormat = "'.$CDformat.'";
+FinishMessage = "'.$CDfinal.'";
+
+function CountBack(secs) {
+  if (secs < 0) {
+    document.getElementById("countdown").innerHTML = FinishMessage;
+    return;
+  }
+  origSecs = secs;
+  days = Math.floor(secs / (60 * 60 * 24));
+  secs %= (60 * 60 * 24);
+  hours = Math.floor(secs / (60 * 60));
+  secs %= (60 * 60);
+  minutes = Math.floor(secs / 60);
+  secs %= 60;
+  seconds = secs;
+
+  DisplayStr = DisplayFormat.replace(/{days}/g, days);
+  DisplayStr = DisplayStr.replace(/{hours}/g, hours);
+  DisplayStr = DisplayStr.replace(/{minutes}/g, minutes);
+  DisplayStr = DisplayStr.replace(/{seconds}/g, seconds);
+
+  document.getElementById("countdown").innerHTML = DisplayStr;
+  setTimeout("CountBack(" + (origSecs - 1) + ")", SetTimeOutPeriod);
+}
+var SetTimeOutPeriod = 1000;
+
+var dateTarget = new Date(TargetDate);
+var dateNow = new Date();
+  dateDiff = new Date(dateTarget - dateNow);
+gsecs = Math.floor(dateDiff.valueOf()/1000);
+CountBack(gsecs);
+</script>
+';
+}
+?>

--- /dev/null
+++ b/blocks/countdown/en.php
@@ -1,1 +1,37 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define ("_NOCOUNTDOWN", "There is no countdown active.");
+define ("_TARGETDATE", "Target Date");
+define ("_FINISHMESSAGE", "Finish Message");
+define ("_COUNTDOWNFORMAT", "{days} days, {hours} hours, {minutes} minutes, {seconds} seconds.");
+define ("_FORMATCOUNT", "Countdown Format");
+define ("_COUNTDOWNOVER", "The countdown is over.");
+define ("_COUNTDOWNACTIVE", "Countdown Active");
+define ("_DATENOTE", "Target date should be in the format: MM/DD/YYYY HH:MM.  Use 24 hour clock for the time. Use the following variables in your countdown format string: {days}, {hours}, {minutes}, {seconds}.  To stop the countdown leave the target date blank.");
+?>

--- /dev/null
+++ b/blocks/countdown/index.php

--- /dev/null
+++ b/blocks/countdown/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('countdown', 'Countdown', '0', 'countdown/block.php', '');");
+?>

--- /dev/null
+++ b/blocks/featured/admin.php
@@ -1,1 +1,36 @@
-
+<?php
+if(!defined("_CHARSET")) exit( );
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'featured'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+include("blocks/".$blocks['featured']['file']);
+if($use_tpl) $tpl->gotoBlock("_ROOT");
+	if(isset($_POST['submit'])) {
+		if($_POST['tpl']) $blocks['featured']['tpl'] = 1;
+		else unset($blocks['featured']['tpl']);
+		if($_POST['allowtags']) $blocks['featured']['allowtags'] = 1;
+		else unset($blocks['featured']['allowtags']);
+		if($_POST['sumlength'] && isNumber($_POST['sumlength'])) $blocks['featured']['sumlength'] = $_POST['sumlength'];
+		else unset($blocks['featured']['sumlength']);
+		$output .= "<div style='text-align: center;'>"._ACTIONSUCCESSFUL."</div>";
+		save_blocks( $blocks );
+		unset($admin);
+	}
+	else  {
+		$output .= "<div style='text-align: center;'><span class='label'>"._CURRENT.":</span><br /><div class=\"tblborder\" style=\"width: 80%; text-align: left; margin: 1ex auto;\">".($use_tpl ? _NATPL : $content)."</div><br /></div>";
+		$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=featured\">
+			<label for=\"tpl\">"._FORMAT.":</label><select name=\"tpl\" class=\"textbox\" id=\"tpl\"><option value=\"0\"".(!isset($blocks['featured']['tpl']) || !$blocks['featured']['tpl'] ? " selected" : "").">"._DEFAULT."</option>
+					<option value=\"1\"".(isset($blocks['featured']['tpl']) && $blocks['featured']['tpl'] ? " selected" : "").">"._USETPL."</option></select><br />
+			<label for=\"allowtags\">"._TAGS.":</label><select class=\"textbox\" name=\"allowtags\" id=\"allowtags\"><option value=\"0\"".(!isset($blocks['featured']['allowtags']) || !$blocks['featured']['allowtags'] ? " selected" : "").">"._STRIPTAGS."</option>
+					<option value=\"1\"".(isset($blocks['featured']['allowtags']) && $blocks['featured']['allowtags'] ? " selected" : "").">"._ALLOWTAGS."</option></select><br />
+			<label for=\"sumlength\">"._SUMLENGTH.":</label><input type=\"text\" class=\"textbox\" name=\"sumlength\" id=\"sumlength\" size=\"4\" value=\"".(isset($blocks['featured']['sumlength']) ? $blocks['featured']['sumlength'] : "")."\"><br />
+			<INPUT type=\"submit\" class=\"button\" name=\"submit\" id=\"submit\" value=\""._SUBMIT."\"></form></div><div style='text-align: center;'>"._SUMNOTE."</div>";
+	}
+?>

--- /dev/null
+++ b/blocks/featured/en.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_FEATUREDSUMNOTE", "Default is 75 characters.");
+?>

--- /dev/null
+++ b/blocks/featured/featured.php
@@ -1,1 +1,47 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+if(!defined("_CHARSET")) exit( );
+	$content = "";
+	$count = 0;
+	$limit = isset($blocks['featured']['limit']) ? $blocks['featured']['limit'] : false;
+	$use_tpl = isset($blocks['featured']['tpl']) && $blocks['featured']['tpl'] ? true : false;
+	$query = dbquery(_STORYQUERY." AND stories.featured = '1'".($limit ? " LIMIT $limit" : ""));
+	while($stories = dbassoc($query))
+	{
+		if(!isset($blocks['featured']['allowtags'])) $stories['summary'] = strip_tags($stories['summary']);
+		$stories['summary'] = truncate_text(stripslashes($stories['summary']), (isset($blocks['featured']['sumlength']) ? $blocks['featured']['sumlength'] : 75));
+		if(!$use_tpl) $content .= "<div class='featuredstory'>".title_link($stories)." "._BY." ".author_link($stories)." ".$ratingslist[$stories['rid']]['name']."<br />".$stories['summary']."</div>";
+		else {
+			$tpl->newBlock("featuredblock");
+			include(_BASEDIR."includes/storyblock.php");
+		}
+	}
+	if($use_tpl && dbnumrows($query) > 0) $tpl->gotoBlock("_ROOT");	
+
+?>

--- /dev/null
+++ b/blocks/featured/index.php

--- /dev/null
+++ b/blocks/featured/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('featured', 'Featured Stories', '0', 'featured/featured.php', '');");
+?>

--- /dev/null
+++ b/blocks/index.php

--- /dev/null
+++ b/blocks/info/admin.php
@@ -1,1 +1,38 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language;
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'info'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+include("blocks/info/info.php");
+if(file_exists("blocks/info/{$language}.php")) include_once("blocks/info/{$language}.php");
+else include_once("blocks/info/en.php");
+	if(isset($_POST['submit'])) {
+		$blocks['info']['style'] = !empty($_POST['style']) && isNumber($_POST['style']) ? $_POST['style'] : 0;
+		if($_POST['template'] != _NARTEXT) $blocks['info']['template'] = $_POST['template'];
+		$output .= "<center>"._ACTIONSUCCESSFUL."</center>";
+		save_blocks( $blocks );
+	}
+	else {
+		$style = isset($blocks['info']['style']) ? $blocks['info']['style'] : 0;
+		if(empty($blocks['info']['template']) && $style == 1) $template = _NARTEXT;
+		else if($style == 1) $template = $blocks['info']['template'];
+		else $template = "";
+		$output .= "<div style='margin: 1em auto; width: 80%;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"text-align: left; padding: 4px; margin: 0 auto;\">$content</div><br />";
+		$output .= "<form method='POST' enctype='multipart/form-data' name='blockadmin' action='admin.php?action=blocks&admin=info'>
+			<label for='template'>"._TEMPLATE.":</label><br /><textarea name='template' rows='5' cols='50' style='width: 100%;'>$template</textarea>";
+		if($tinyMCE) $output .= "<div style='display: block; margin: 0; padding: 0;'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('template');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+		$output .= "<label for='style'>"._DISPLAY.": </label><select name='style'class='textbox' ><option value='0'".(!$style ? " selected" : "").">"._CHART."</option>
+				<option value='1'".($style == 1 ? " selected" : "").">"._NARRATIVE."</option>
+				<option value='2'".($style == 2 ? " selected" : "").">"._VARIABLES."</option></select><br />
+			<INPUT type='submit' class='button' name='submit' value='"._SUBMIT."'></form></div>";
+	}
+?>

--- /dev/null
+++ b/blocks/info/en.php
@@ -1,1 +1,37 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_CHART", "Chart");
+define("_NARRATIVE", "Narrative");
+define("_LOGGEDINAS", "You are currently logged in as");
+define("_VARIABLES", "Variables");
+define("_DISPLAY",  "Style of Display");
+define("_NARTEXT", "We are the home of  {authors} authors from among our {members} members.  There have been {reviews} reviews written about our {stories} stories consisting of {chapters} chapters and {totalwords} words.  A special welcome to our newest member, {newest}. {loggedinas} {submissions}");
+define("_NEWESTMEMBER", "Newest Member");
+define("_REVIEWERS", "Reviewers");
+?>

--- /dev/null
+++ b/blocks/info/index.php

--- /dev/null
+++ b/blocks/info/info.php
@@ -1,1 +1,66 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+if(file_exists(_BASEDIR."blocks/info/{$language}.php")) include_once(_BASEDIR."blocks/info/{$language}.php");
+else include_once(_BASEDIR."blocks/info/en.php");
+	global $noskin, $tpl;
+
+	if(_AUTHORTABLE != TABLEPREFIX."fanfiction_authors") {
+		list($members) = dbrow(dbquery("SELECT COUNT("._UIDFIELD.") as members FROM "._AUTHORTABLE));
+		list($newest) = dbrow(dbquery("SELECT "._UIDFIELD." as uid FROM "._AUTHORTABLE." ORDER BY "._UIDFIELD." DESC LIMIT 1"));
+		dbquery("UPDATE ".TABLEPREFIX."fanfiction_stats SET members = $members, newestmember = '$newest' WHERE sitekey = '".SITEKEY."' LIMIT 1");
+	}
+	$stats = dbassoc(dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_stats WHERE sitekey = '".SITEKEY."' LIMIT 1"));
+	list($newmember) = dbrow(dbquery("SELECT "._PENNAMEFIELD." as penname FROM "._AUTHORTABLE." WHERE "._UIDFIELD." = '".$stats['newestmember']."' LIMIT 1"));
+	$adminnotices = "";
+	if(isADMIN) {
+		if(file_exists(_BASEDIR."languages/".$language."_admin.php")) include_once(_BASEDIR."languages/".$language."_admin.php");
+		else include_once(_BASEDIR."languages/en_admin.php");
+		$countquery = dbquery("SELECT COUNT(DISTINCT chapid) FROM ".TABLEPREFIX."fanfiction_chapters WHERE validated = '0'");
+		list($count) = dbrow($countquery);
+		if($count) $adminnotices = sprintf(_QUEUECOUNT, $count);
+		$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'adminnotices'");
+		while($code = dbassoc($codequery)) {
+				eval($code['code_text']);
+		}
+	}
+	if(!empty($blocks['info']['style']) && $blocks['info']['style'] == 2) {
+		$tpl->assignGlobal("totalstories", $stats['stories']);
+		$tpl->assignGlobal("totalauthors", $stats['authors']);
+		$tpl->assignGlobal("totalmembers", $stats['members']);
+		$tpl->assignGlobal("totalreviews", $stats['reviews']);
+		$tpl->assignGlobal("totalreviewers", $stats['reviewers']);	
+		$tpl->assignGlobal("totalwords", $stats['wordcount']);
+		$tpl->assignGlobal("totalchapters", $stats['chapters']);
+		$tpl->assignGlobal("totalseries", $stats['series']);
+		$tpl->assignGlobal("newestmember", "<a href=\""._BASEDIR."viewuser.php?uid=".$stats['newestmember']."\">$newmember</a>");
+		if(isMEMBER) $tpl->assignGlobal("loggedinas", _LOGGEDINAS." ".USERPENNAME.". ".($noskin ? " "._NOSKIN : ""));
+		$tpl->assignGlobal("submissions", $adminnotices);
+	}
+	else {
+		if(isMEMBER) $loggedinas = _LOGGEDINAS." ".USERPENNAME.". ".($noskin ? " "._NOSKIN : "");
+		else $loggedinas = "";
+		if(empty($blocks['info']['style'])) {
+			$content = "<div id='infoblock'>
+<div><span class='label'>"._MEMBERS.": </span>".$stats['members']."</div>
+<div><span class='label'>"._SERIES.": </span>".$stats['series']."</div>
+<div><span class='label'>"._STORIES.": </span>".$stats['stories']."</div>
+<div><span class='label'>"._CHAPTERS.": </span>".$stats['chapters']."</div>
+<div><span class='label'>"._WORDCOUNT.": </span>".$stats['wordcount']."</div>
+<div><span class='label'>"._AUTHORS.": </span>".$stats['authors']."</div>
+<div><span class='label'>"._REVIEWS.": </span>".$stats['reviews']."</div>
+<div><span class='label'>"._REVIEWERS.": </span>".$stats['reviewers']."</div>
+<div><span class='label'>"._NEWESTMEMBER.": </span><a href=\""._BASEDIR."viewuser.php?uid=".$stats['newestmember']."\">$newmember</a></div>";
+		}
+		else if($blocks["info"]["style"] == 1) {
+			$replace = array($stats['authors'], $stats['members'], $stats['reviews'], $stats['reviewers'], $stats['wordcount'], $stats['chapters'], $stats['stories'], $stats['series'],"<a href=\""._BASEDIR."viewuser.php?uid=".$stats['newestmember']."\">$newmember</a>", $loggedinas, $adminnotices);
+			$search = array("@\{authors\}@", "@\{members\}@", "@\{reviews\}@", "@{reviewers\}@", "@\{totalwords\}@","@\{chapters\}@", "@\{stories\}@", "@\{series\}@", "@\{newest\}@", "@\{loggedinas\}@", "@\{submissions\}@");
+			$content = preg_replace($search, $replace, (!empty($blocks['info']['template']) ? stripslashes($blocks['info']['template']) : _NARTEXT));
+		}
+	}
+	$codequery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_codeblocks WHERE code_type = 'sitestats'");
+	while($code = dbassoc($codequery)) {
+			eval($code['code_text']);
+	}
+	if(empty($blocks['info']['style'])) $content .= "<div>$adminnotices</div><div class='cleaner'>&nbsp;</div></div>";
+?>

--- /dev/null
+++ b/blocks/info/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('info', 'Site Information', '0', 'info/info.php', '');");
+?>

--- /dev/null
+++ b/blocks/linktous/README.txt
@@ -1,1 +1,23 @@
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+Copyright 2008 by Tammy Keefer.
+
+This block for eFiction 3.x adds a "Link to Us" block to the script that
+displays a random banner for your site inviting visitors to link to you.
+
+This block requires some customization.  You'll need to open the linktous.php
+file and edit the section marked for configuration.

--- /dev/null
+++ b/blocks/linktous/index.php

--- /dev/null
+++ b/blocks/linktous/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('linktous', 'Link to Us', '0', 'linktous/linktous.php', '');");
+?>

--- /dev/null
+++ b/blocks/linktous/linktous.php
@@ -1,1 +1,46 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+/* Start block configuration */
+
+// The text that will appear under your image.  
+$link2us = "Link to Us!";
+
+// The folder or URL to the folder where your images are stored.
+// Include the trailing slash!
+$imgfolder = _BASEDIR."buttons/";
+
+// The page you're sending them to for the code
+$codepage = _BASEDIR."promote.php";
+
+// The list of your images.  One per line.
+$images[] = "88x31-A.jpg";
+$images[] = "88x31-B.jpg";
+$images[] = "88x31-C.jpg";
+$images[] = "88x31-D.jpg";
+$images[] = "88x31-E.jpg";
+$images[] = "88x31-F.jpg";
+$images[] = "88x31-G.jpg";
+$images[] = "88x31-H.jpg";
+$images[] = "88x31-I.jpg";
+$images[] = "88x31-J.jpg";
+$images[] = "88x31-K.jpg";
+$images[] = "88x31-L.jpg";
+$images[] = "88x31-M.jpg";
+$images[] = "88x31-N.jpg";
+$images[] = "88x31-O.jpg";
+$images[] = "100x35-A.jpg";
+$images[] = "100x35-B.jpg";
+$images[] = "100x35-C.jpg";
+$images[] = "100x35-D.jpg";
+$images[] = "100x35-E.jpg";
+$images[] = "100x35-F.jpg";
+$images[] = "100x35-G.jpg";
+
+/* End block configuration */
+
+$img = $images[mt_rand(0, count($images) - 1)];
+
+$content = "<div style='text-align: center;'><a href='$codepage' alt='$link2us'><img src='$imgfolder$img' alt='$sitename' /></a><br /><a href='$codepage'>$link2us</a></div>";
+unset($images, $img);
+?>

--- /dev/null
+++ b/blocks/login/README.txt
@@ -1,1 +1,20 @@
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+Copyright 2007 by Tammy Keefer.
+
+This block for eFiction 3.0 bridged to SMF displays a login block on your
+eFiction site that will log you in via your SMF site. 

--- /dev/null
+++ b/blocks/login/admin.php
@@ -1,1 +1,46 @@
-
+<?php
+if(!defined("_CHARSET")) exit( );
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'login'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+global $language;
+// Set $loggedin to 0 to see the block
+include("blocks/login/login.php");
+// Then set it back to 1. 
+if(file_exists("blocks/login/$language.php")) include("blocks/login/$language.php");
+else include("blocks/login/en.php");
+	if(isset($_POST['submit'])) {
+		$blocks['login']['acctlink'] = $_POST['acctlink'];
+		if(empty($_POST['form'])) unset($blocks['login']['form']);
+		else $blocks['login']['form'] = $_POST['form'];
+		$blocks['login']['template'] = addslashes(descript($_POST['template']));
+		save_blocks( $blocks );
+		unset($_GET['admin']);
+		$output .= write_message(_ACTIONSUCCESSFUL);
+	}
+	else {
+		if(empty($blocks['login']['template'])) $template = "";
+		else $template = $blocks['login']['template'];
+		$output .= "<div style='text-align: center;'><span class='label'>"._CURRENT.":</span><br /><div class=\"tblborder\" style=\"width: 80%; text-align: left; margin: 1ex auto;\">$content</div></div><br />";
+		$output .= _LOGINNOTE."<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=login\">
+			<div><label for=\"template\">"._TEMPLATE.":</label><span style='clear: left;'>&nbsp;</span></div>
+			<div class=\"shorttextarea\"><textarea name=\"template\" rows=\"5\" style=\"width: 100%;\" cols=\"40\">".stripslashes($template)."</textarea>";
+		if($tinyMCE) 
+			$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('template');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+		$output .= "</div>
+			<label for=\"form\">"._DEFAULTOPTS.":</label> <select name=\"form\" id=\"form\" class=\"textbox\" ><option value=\"0\"".(empty($blocks['login']['form']) ? " selected" : "").">"._SHORT."</option>
+					<option value=\"1\"".(!empty($blocks['login']['form']) ? " selected" : "").">"._LONG."</option>
+			</select><br />
+			<label for=\"acctlink\">"._ACCTLINK."</label> <select name=\"acctlink\" id=\"acctlink\" class=\"textbox\" ><option value=\"0\"".(empty($blocks['login']['acctlink']) ? " selected" : "").">"._NO."</option>
+					<option value=\"1\"".(!empty($blocks['login']['acctlink']) ? " selected" : "").">"._YES."</option>
+			</select><br />
+			<INPUT type=\"submit\" class=\"button\" id=\"submit\" name=\"submit\" value=\""._SUBMIT."\"></form></div>";
+	}
+?>

--- /dev/null
+++ b/blocks/login/en.php
@@ -1,1 +1,34 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define ("_SHORT", "Short Form");
+define ("_LONG", "Long Form");
+define ("_ACCTLINK", "Display '".$pagelinks['login']['text']."' link:");
+define ("_DEFAULTOPTS", "Default Display Options");
+define ("_LOGINNOTE", "The 'short form' will not include the register and lost password links while the 'long form' will.  You may also use the textbox to customize the display."); 
+?>

--- /dev/null
+++ b/blocks/login/index.php

--- /dev/null
+++ b/blocks/login/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('login', 'Login', '0', 'login/login.php', '');");
+?>

--- /dev/null
+++ b/blocks/login/login.php
@@ -1,1 +1,21 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+	$longform = "{penname} {password} {rememberme} {go} <div id='loginlinks'>{register} | {lostpwd}</div>";
+	$shortform = "{penname} {password} {rememberme} {go}";
+if(!isMEMBER) {
+	$content = "<form method=\"POST\" id=\"loginblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."user.php?action=login\">";
+	$replace = array("<label for=\"penname=\">"._PENNAME.":</label><INPUT type=\"text\" class=\"textbox\" name=\"penname\" id=\"penname\" size=\"15\">", 
+			"<label for=\"password\">"._PASSWORD.":</label><INPUT type=\"password\" class=\"textbox\" name=\"password\" id=\"password\" size=\"15\">",
+			"<span id='rememberme'><INPUT type=\"checkbox\" class=\"checkbox\" name=\"cookiecheck\" id=\"cookiecheck\" value=\"1\"><label for=\"cookiecheck=\">"._REMEMBERME."</label></span>",
+			(!empty($pagelinks['register']['link']) ? $pagelinks['register']['link'] : ""), $pagelinks['lostpassword']['link'],
+			"<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._GO."\">");
+	$search = array("@\{penname\}@", "@\{password\}@", "@\{rememberme\}@", "@\{register\}@", "@\{lostpwd\}@", "@\{go\}@");
+	if(!empty($blocks['login']['template'])) $content .= preg_replace($search, $replace, stripslashes($blocks['login']['template']));
+	else $content .= preg_replace( $search, $replace , (!empty($blocks['login']['form']) ? $longform : $shortform));		
+	$content .= "</form>";
+}
+else if(!empty($blocks['login']['acctlink'])) $content = $pagelinks['login']['link'];
+else $content = "";
+
+?>

--- /dev/null
+++ b/blocks/menu/admin.php
@@ -1,1 +1,87 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language, $pagelinks;
+$linkquery = dbquery("SELECT * from ".TABLEPREFIX."fanfiction_pagelinks ORDER BY link_access ASC");
+if(!isset($current)) $current = "";
+
+		$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = '$admin'");
+		while($block = dbassoc($blockquery)) {
+			if ($block['block_variables'])
+			{
+				$blocks[$block['block_name']] = unserialize($block['block_variables']);
+			}
+			$blocks[$block['block_name']]['title'] = $block['block_title'];
+			$blocks[$block['block_name']]['file'] = $block['block_file'];
+			$blocks[$block['block_name']]['status'] = $block['block_status'];
+		}
+		$content = isset($blocks[$admin]['content']) ? $blocks[$admin]['content'] : array();
+
+while($link = dbassoc($linkquery)) {
+	$tpl->assignGlobal($link['link_name'], "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+	$pagelinks[$link['link_name']] = array("id" => $link['link_id'], "text" => $link['link_text'], "url" => _BASEDIR.$link['link_url'], "link" => "<a href=\""._BASEDIR.$link['link_url']."\" title=\"".$link['link_text']."\"".($link['link_target'] ? " target=\"_blank\"" : "").($current == $link['link_name'] ? " id=\"current\"" : "").">".$link['link_text']."</a>");
+}
+include("blocks/".$blocks[$admin]['file']);
+if(file_exists("blocks/menu/{$language}.php")) include("blocks/menu/{$language}.php");
+else include("blocks/menu/en.php");
+	if(isset($_GET['up'])) {
+		$pos = array_search($_GET['up'], $blocks[$admin]['content']);
+		if($pos >= 1) {
+			$blocks[$admin]['content'][$pos] = $blocks[$admin]['content'][$pos - 1];
+			$blocks[$admin]['content'][$pos - 1] = $_GET['up'];
+			$blocks[$admin]['content'] = $blocks[$admin]['content'];
+			save_blocks( $blocks );
+		}
+	}
+	if(isset($_GET['down'])) {
+		$pos = array_search($_GET['down'], $blocks[$admin]['content']);
+		if($pos <= count($blocks[$admin]['content'])) {
+			$blocks[$admin]['content'][$pos] = $blocks[$admin]['content'][$pos + 1];
+			$blocks[$admin]['content'][$pos + 1] = $_GET['down'];
+			$blocks[$admin]['content'] = $blocks[$admin]['content'];
+			save_blocks( $blocks );
+		}
+	}		
+	if(isset($_POST['submit'])) {
+		$newcontent = array( );
+		for($x = 0; $x <= count($pagelinks); $x++) {
+			if(isset($_POST["content_$x"])) $newcontent[] = $_POST["content_$x"];
+		}
+		$blocks[$admin]['content'] = $newcontent;
+		$blocks[$admin]['style'] = isset($_POST['style']) && !empty($_POST['style']) ? 1 : 0;
+		save_blocks( $blocks );
+	}
+	if($admin){
+		$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = '$admin'");
+		while($block = dbassoc($blockquery)) {
+			$blocks[$block['block_name']] = unserialize($block['block_variables']);
+			$blocks[$block['block_name']]['title'] = $block['block_title'];
+			$blocks[$block['block_name']]['file'] = $block['block_file'];
+			$blocks[$block['block_name']]['status'] = $block['block_status'];
+		}
+		$content = isset($blocks[$admin]['content']) ? $blocks[$admin]['content'] : array();
+		$output .= "<div style=\"width: 300px; margin: 0 auto;\"><form method=\"POST\" enctype=\"multipart/form-data\"action=\"admin.php?action=blocks&admin=$admin\">
+			<table class=\"tblborder\" width=\"100%\"><tr><th>"._TITLE."</th><th colspan=\"2\">"._MOVE."</th></tr>";
+		$count = 1;
+		if(is_array($content)) {
+			foreach($content as $link) {
+				$output .= "<tr><td class='tblborder'><input type=\"checkbox\" class=\"checkbox\" checked name=\"content_$count\" value=\"$link\">".$pagelinks["$link"]['link']."</td>
+					<td class='tblborder' width=\"15\">".($count > 1 ? "<a href=\"admin.php?action=blocks&admin=$admin&up=$link\"><img src=\"images/arrowup.gif\" width=\"13\" height=\"18\" alt=\""._UP."\" title=\""._UP."\" border=\"0\"></a>" : "")."</td>
+					<td class='tblborder' width=\"15\">".($count < sizeof($blocks[$admin]['content']) ? "<a href=\"admin.php?action=blocks&admin=$admin&down=$link\"><img src=\"images/arrowdown.gif\" width=\"13\" height=\"18\" alt=\""._DOWN."\" title=\""._DOWN."\" border=\"0\"></a>" : "")."</td></tr>";
+				$count++;
+			}
+		}
+		foreach($pagelinks as $page => $link) {
+			if(!is_array($content) || !in_array($page, $content)) {
+				$output .= "<tr><td class='tblborder'><input type=\"checkbox\" class=\"checkbox\" name=\"content_$count\" value=\"$page\">".$link['link']."</td>
+					<td class='tblborder' colspan=\"2\">&nbsp;</td></tr>";
+				$count++;
+			}
+		}
+		$output .= "</table><br /><div style=\"text-align: center;\">
+			<label for=\"style\">"._STYLE.":</label> <SELECT name=\"style\" id=\"style\">
+			<option value=\"1\"".(!empty($blocks["menu"]['style']) ? " selected" : "").">"._NOLIST."</option>
+			<option value=\"0\"".(empty($blocks['menu']['style']) ? " selected" : "").">"._LISTFORMAT."</option>
+			</select><br /><br /><INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></div></form></div>";
+	}
+?>

--- /dev/null
+++ b/blocks/menu/en.php
@@ -1,1 +1,32 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_STYLE", "Style");
+define("_LISTFORMAT", "Unordered List");
+define("_NOLIST", "Links Only");
+?>

--- /dev/null
+++ b/blocks/menu/index.php

--- /dev/null
+++ b/blocks/menu/init.php
@@ -1,1 +1,31 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('menu', 'Main Menu', '0', 'menu/menu.php', '');");
+$blocks["menu"] = array("title" => "Main Menu", "status" => "0", "file" => "menu/menu.php");
+?>

--- /dev/null
+++ b/blocks/menu/menu.php
@@ -1,1 +1,22 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+	if(isset($blocks[$block]['content'])) {
+		foreach($blocks[$block]['content'] as $page) {
+			if(isset($pagelinks[$page]['link'])) {
+				if(empty($blocks[$block]['style'])) $content .= "<li ".($current == $page ? "id=\"menu_current\"" : "").">".$pagelinks[$page]['link']."</li>";
+				else $content .= $pagelinks[$page]['link'];
+			}
+		}
+	}
+	else {
+		$pages = array('home', 'recent', 'titles', 'catslink', 'series', 'members', 'authors', 'challenges', 'search', 'tens', 'featured', 'help', 'contactus', 'login', 'logout', 'adminarea');
+		foreach($pages as $page) {
+			if(empty($pagelinks[$page])) continue;
+			if(empty($blocks[$block]['style'])) $content .= "<li ".($current == $page ? "id=\"menu_current\"" : "").">".$pagelinks[$page]['link']."</li>";
+			else $content .= $pagelinks[$page]['link'];
+		}
+	}
+	if(empty($blocks[$block]['style'])) $content = "<ul>$content</ul>";
+	$content = "<div id=\"$block\">$content</div>";
+?>

--- /dev/null
+++ b/blocks/news/admin.php
@@ -1,1 +1,36 @@
+<?php
+if(!defined("_CHARSET")) exit( );
+ 
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'news'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+global $language, $numupdated;
 
+if (file_exists(_BASEDIR . "blocks/news/" . $language . ".php")) include(_BASEDIR . "blocks/news/" . $language . ".php");
+else include(_BASEDIR . "blocks/news/en.php");
+
+include("blocks/".$blocks['news']['file']);
+	if(isset($_POST['submit'])) {
+		if(isset($_POST['num']) && isNumber($_POST['num'])) $blocks['news']['num'] = $_POST['num'];
+		else $blocks['news']['num'] = 1;
+		if(isset($_POST['sumlength']) && isNumber($_POST['sumlength'])) $blocks['news']['sumlength'] = $_POST['sumlength'];
+		else unset($blocks['news']['sumlength']);
+		$output .= "<div style='text-align: center;'>"._ACTIONSUCCESSFUL."</div>";
+		save_blocks( $blocks );
+	}
+	else  {
+		if(!isset($blocks['news']['sumlength'])) $blocks['news']['sumlength'] = "";
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 80%; margin: 0 auto; text-align: left;\">$content</div><br /></div>";
+		$output .= "<div><div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=news\">
+			<div><label for=\"num\">"._NUMNEWS.":</label><input type=\"text\" class=\"textbox\" name=\"num\" id=\"num\" size=\"4\" value=\"".$blocks['news']['num']."\"></div>
+		<div><label for=\"num\">"._SUMLENGTH.":</label><input type=\"text\" class=\"textbox\" name=\"sumlength\" id=\"sumlength\" size=\"6\" value=\"".$blocks['news']['sumlength']."\"></div>
+			<INPUT type=\"submit\" name=\"submit\" class=\"button\" id=\"submit\" value=\""._SUBMIT."\"></form></div><div style='clear: both;'></div></div>";
+	}
+?>

--- /dev/null
+++ b/blocks/news/en.php
@@ -1,1 +1,31 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define ("_NUMNEWS", "Number of items");
+define ("_READMORE", "Read more...");
+?>

--- /dev/null
+++ b/blocks/news/index.php

--- /dev/null
+++ b/blocks/news/init.php
@@ -1,1 +1,31 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('news', 'Site News', '0', 'news/news.php', '');");
+$blocks["news"] = array("title" => "Site News", "status" => "1", "file" => "news/news.php", "num" => "3");
+?>

--- /dev/null
+++ b/blocks/news/news.php
@@ -1,1 +1,61 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+	if(isset($blocks['news']['num'])) $numupdated = $blocks['news']['num'];
+	else $numupdated = 1;
+	if(file_exists("$skindir/newsbox.tpl")) $news = new TemplatePower( "$skindir/newsbox.tpl" );
+	else $news = new TemplatePower( _BASEDIR."default_tpls/newsbox.tpl" );
+	if(file_exists(_BASEDIR."blocks/news/".$language.".php")) include_once(_BASEDIR."blocks/news/".$language.".php");
+	else include_once(_BASEDIR."blocks/news/en.php");
+
+	$news->prepare();
+	$newsquery = dbquery("SELECT nid, author, title, story, time as date, comments FROM ".TABLEPREFIX."fanfiction_news ORDER BY time DESC LIMIT $numupdated");
+	$count = 0;
+	while($stories = dbassoc($newsquery)) {
+
+		//create a new number_row block
+		$news->newBlock("newsbox");
+		
+		//assign values
+		if(!empty($blocks['news']['sumlength']) && isNumber($blocks['news']['sumlength'])) $newsStory = truncate_text($stories['story'], $blocks['news']['sumlength'])."<div class='newsReadMore'><a href='news.php?action=newsstory&amp;nid=".$stories['nid']."'>"._READMORE."</a></div>";
+		else $newsStory = format_story($stories['story']);
+		$news->assign("newstitle" , $stories['title'] );
+		$news->assign("newsstory" , $newsStory);
+		$news->assign("newsauthor", $stories['author'] );
+		$news->assign("newsdate", date("$dateformat $timeformat", $stories['date']) );
+		$news->assign("oddeven", ($count % 2 ? "even" : "odd"));
+		$news->assign("newsid", $stories['nid']);
+		$news->assign("skindir", $skindir);
+		if($newscomments)
+			$news->assign("newscomments", "<a href=\"news.php?action=newsstory&amp;nid=".$stories['nid']."\">".$stories['comments']." "._COMMENTS."</a>");
+		if(isADMIN) 
+			$news->assign("adminoptions", "<a href=\"admin.php?action=news&amp;form=".$stories['nid']."\">"._EDIT."</a> | <a href=\"admin.php?action=news&amp;delete=".$stories['nid']."\">"._DELETE."</a>");
+		$count++;
+	}
+	$news->gotoBlock("_ROOT");
+	$content = $news->getOutputContent( );
+?>

--- /dev/null
+++ b/blocks/online/README.txt
@@ -1,1 +1,34 @@
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+Copyright 2006 by Tammy Keefer.
+
+This block for eFiction 3.0 displays which of your members is currently online 
+and how many guests are visiting the site as well. In addition to the standard 
+{blockname_title} and {blockname_content}, this block also adds {guests} as 
+the number of guests and {onlinemembers} as the hyperlinked list of members online.
+
+VERY IMPORTANT NOTE:  For this block to work correctly it must be set to Active 
+even if it is only displayed on the index page because the block not only displays 
+who is online it also tracks that information.  If it is set to "Index Only" you 
+will only get the information for people on your index page.  And it must be set
+this way on EVERY skin.  Again, even if it doesn't display, it must still be
+set to Active for the visitor information to be recorded.
+
+There is no admin panel for this block.  As is, it displays the people who have 
+been on the site(loaded a page) in the last minute.  If you want to increase 
+that time, open online.php and go to line 13 and replace 60 with the number of 
+seconds you wish.

--- /dev/null
+++ b/blocks/online/en.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_GUESTS", "Guests");
+?>

--- /dev/null
+++ b/blocks/online/index.php

--- /dev/null
+++ b/blocks/online/init.php
@@ -1,1 +1,35 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('online', 'Who\'s Online', '0', 'online/online.php', '');");
+dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_online` (
+  `online_uid` int(11) NOT NULL default '0',
+  `online_ip` int(11) NOT NULL default '0',
+  `online_timestamp` int(11) NOT NULL default '0'
+) ENGINE=MyISAM;");
+?>

--- /dev/null
+++ b/blocks/online/online.php
@@ -1,1 +1,43 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+	global $dateformat, $tpl;
+	if(file_exists(_BASEDIR."blocks/online/{$language}.php")) include(_BASEDIR."blocks/online/{$language}.php");
+	else include(_BASEDIR."blocks/online/en.php");
+
+	$where = "online_uid=" . (USERUID ? USERUID : "0 AND online_ip = INET_ATON('" . $_SERVER['REMOTE_ADDR'] . "')");
+ 
+	$result = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_online WHERE $where");
+ 
+	if(dbnumrows($result) > 0) {
+		
+			dbquery("UPDATE ".TABLEPREFIX."fanfiction_online SET online_timestamp = '".time( )."' WHERE $where");
+	}
+	else {
+		$ip = $_SERVER['REMOTE_ADDR'];
+		if (filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4))
+		{
+
+		} 
+		else {
+			$ip = 0;	
+		}
+		
+		dbquery("INSERT INTO " . TABLEPREFIX . "fanfiction_online(online_uid, online_ip, online_timestamp)
+		 VALUES('" . (USERUID ? USERUID : 0) . "', INET_ATON('" . $ip . "'), '" . time() . "')");
+	} 
+ 
+	$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_online WHERE online_timestamp < ".(time()-60));
+	$q1 = dbquery("SELECT COUNT(online_ip) FROM ".TABLEPREFIX."fanfiction_online WHERE online_uid = 0");
+ 
+	list($guests) = dbrow($q1);
+	$tpl->assignGlobal("guests", empty($guests) ? 0 : $guests);
+	$q2 = dbquery("SELECT o.online_uid, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_online as o, "._AUTHORTABLE." WHERE o.online_uid = "._UIDFIELD." AND o.online_uid != 0");
+	$omlist = array( );
+	while($om = dbassoc($q2)) {
+		$omlist[] = "<a href='"._BASEDIR."viewuser.php?uid=".$om['online_uid']."'>".$om['penname']."</a>";
+	}
+	$tpl->assignGlobal("onlinemembers", count($omlist) ? implode(", ", $omlist) : "");
+	$content = "<div id='who_online'><span class='label'>"._GUESTS.":</span> ".($guests ? $guests : 0)."<br />\n
+		<span class='label'>"._MEMBERS.":</span> ".(count($omlist) ? implode(", ", $omlist) : "")."</div>";
+?>

--- /dev/null
+++ b/blocks/poll/README.txt
@@ -1,1 +1,43 @@
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+Copyright 2006 by Tammy Keefer.
+
+This block for eFiction 3.0 displays a one question poll.  It is set up so that only members 
+can vote and they can only vote once.  Visitors and members will see the current tally of 
+votes while members who haven't voted will see the question with a form to cast their vote.  
+The only thing to set in the admin panel is the question and the options.  Enter the options 
+one per line in the text box.  Because of tinyMCE, <p> tags will get stripped from the options.  
+All other allowable tags from your site's config settings will be honored.  You'll have to 
+use <br> tags instead if you want a multi-line option.  Sorry. :( 
+
+The bar graphic is 12 pixels high by 1 pixel wide.  There's a folder with a few alternatives 
+included.  If you want to change the color of the bar for a single skin include the following 
+in the skin's variables.php file.
+
+$blocks['poll']['bar'] = $skindir."/images/BARIMAGE.JPG";
+
+Replacing BARIMAGE.JPG with the name of your image.  If you want to style the bar images (adding
+a 1px solid border looks nice) use the .poll class.  The poll question is inside a <div> with the 
+id of poll_question. So you can style that with #poll_question.  There are a number of alternative 
+bars in the bars folder.
+
+You can only have one poll active at a time.  When you close a poll the votes for that poll are 
+deleted and the total results stored with the poll question. I did it this way to keep the 
+database from growing.  The votes table will then be emptied for use in the next poll.  If 
+no poll is going on the block will display "There is no poll currently active."  
+
+

--- /dev/null
+++ b/blocks/poll/admin.php
@@ -1,1 +1,64 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language, $tinyMCE, $allowed_tags;
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'poll'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+include("blocks/".$blocks['poll']['file']);
+	if(isset($_GET['delete']) && isNumber($_GET['delete'])) {
+		$delete = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_id = '$_GET[delete]' LIMIT 1");
+		if($delete) $output .= write_message(_ACTIONSUCCESSFUL);
+	}	
+	if(isset($_POST['close_current'])) {
+		$final = "";
+		foreach($pollopts as $num => $opt) {
+			if(strlen($final) > 0) $final .= "#";
+			$n = $num + 1;
+			$final .= (isset($results[$n]) ? $results[$n] : "0");
+		}
+		$closepoll =dbquery("UPDATE ".TABLEPREFIX."fanfiction_poll SET poll_results = '$final', poll_end = '" . time() . "' WHERE poll_id = '".$currentpoll['poll_id']."'");
+		if($closepoll) $emptyvotes = dbquery("TRUNCATE TABLE `".TABLEPREFIX."fanfiction_poll_votes`");
+		$output .= write_message(_ACTIONSUCCESSFUL);
+	}
+	if(isset($_POST['submit'])) {
+		$poll_question = escapestring(descript(stripslashes($_POST['poll_question'])));
+		$opts = explode("\r\n", ltrim(strip_tags(preg_replace( '!<p>!iU', "\r\n",  stripslashes(trim($_POST['poll_opts']))), preg_replace("!<p>!iu", "", $allowed_tags))));
+		$new_opts = array( );
+		foreach($opts as $opt) { 
+			if(strlen(trim(preg_replace("!&nbsp;!", " ", $opt))) > 0) $new_opts[] = $opt;
+		}
+		$new_opts = escapestring(implode("|#|", $new_opts));
+		$newpoll = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll(`poll_question`, `poll_opts`, `poll_start`) VALUES('$poll_question', '$new_opts', '" . time() . "')");
+		include("blocks/".$blocks['poll']['file']);
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 200px; margin: 0 auto; text-align: left;\">$content</div><br /></div>";
+	}
+	if($currentpoll && !isset($_POST['close_current'])) {
+		include("blocks/".$blocks['poll']['file']);
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 200px; margin: 0 auto; text-align: left;\">$content</div><br /></div>";
+		$output .= "<form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&amp;admin=poll\" style='text-align: center;'><INPUT type=\"submit\" class=\"button\" name=\"close_current\" value=\""._CLOSEPOLL."\"></form>";
+	}
+	else  {
+		$output .= "<div style='width: 400px; margin: 1em auto; text-align: center;'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=poll\">
+			<label for=\"poll_question\">"._POLLQUESTION."</label><textarea name='poll_question' cols='40' id='poll_question' rows='5'></textarea><br />";
+		if($tinyMCE) 
+			$output .= "<div class='tinytoggle'><input type='checkbox' name='toggle' onclick=\"toogleEditorMode('poll_question');\" checked><label for='toggle'>"._TINYMCETOGGLE."</label></div>";
+		$output .= "<label for=\"poll_opts\">"._POLLOPTS."</label><textarea name='poll_opts' id='poll_opts' class='mceNoEditor' cols='40' rows='5'></textarea><br />";
+		$output .= "<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SUBMIT."\"></form></div>";
+	}
+	$oldpolls = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end != 0 ORDER BY poll_id DESC");
+	if(dbnumrows($oldpolls)) {
+		$output .= "<table class='tblborder' style='width: 400px; margin: 1em auto; text-align: center;'><tr><th>"._POLLQUESTION."</th><th>"._OPTIONS."</th></tr>";
+		while($poll = dbassoc($oldpolls)) {
+			$output .= "<tr><td class='tblborder'>".stripslashes($poll['poll_question'])."</td><td class='tblborder'><a href='admin.php?action=blocks&amp;admin=poll&amp;delete=".$poll['poll_id']."'>"._DELETE."</a></td></tr>";
+		}
+		$output .= "</table><br />";
+	}
+?>

 Binary files /dev/null and b/blocks/poll/bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/000_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/009_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/06F_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/369_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/909_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/960_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/999_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/C69_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/F90_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/FF0_bar.jpg differ

 Binary files /dev/null and b/blocks/poll/bars/Thumbs.db differ

 Binary files /dev/null and b/blocks/poll/bars/bar.png differ

 Binary files /dev/null and b/blocks/poll/bars/dk_brown.gif differ

 Binary files /dev/null and b/blocks/poll/bars/dk_green.gif differ

 Binary files /dev/null and b/blocks/poll/bars/dk_red.gif differ

 Binary files /dev/null and b/blocks/poll/bars/lt_green.gif differ

 Binary files /dev/null and b/blocks/poll/bars/orange.gif differ

--- /dev/null
+++ b/blocks/poll/en.php
@@ -1,1 +1,14 @@
-
+<?php
+define("_ALREADYVOTED", "You have already voted!");
+define("_VOTE", "Vote!");
+define("_VOTECAST", "Your vote has been cast.");
+define("_NOPOLL", "There is no poll currently active.");
+define("_POLLQUESTION", "Poll Question: (limit 250 characters)");
+define("_POLLARCHQUESTION", "Poll Question");
+define("_POLLOPTS", "Poll Options: (Enter one per line. Note: tags will be stripped.)");
+define("_CLOSEPOLL", "Close the current poll.");
+define("_POLLARCHIVE", "Poll Archive");
+define("_START", "Start");
+define("_END", "End");
+define("_POLLRESULTS", "Poll Results");
+?>

--- /dev/null
+++ b/blocks/poll/index.php

--- /dev/null
+++ b/blocks/poll/init.php
@@ -1,1 +1,46 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('poll', 'Poll', '0', 'poll/poll.php', '');");
+dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_poll_votes` (
+  `vote_id` int(11) NOT NULL auto_increment,
+  `vote_user` int(11) NOT NULL default '0',
+  `vote_opt` int(11) NOT NULL default '0',
+  `vote_poll` int(11) NOT NULL default '0',
+  PRIMARY KEY  (`vote_id`),
+  KEY `vote_user` (`vote_user`,`vote_poll`)
+) ENGINE=MyISAM;") ;
+dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX. "fanfiction_poll` (
+`poll_id` INT NOT NULL AUTO_INCREMENT ,
+`poll_question` VARCHAR( 250 ) NOT NULL ,
+`poll_opts` TEXT NOT NULL ,
+`poll_start` int(10) unsigned NOT NULL default '0',
+`poll_end` int(10) unsigned NOT NULL default '0',
+`poll_results` VARCHAR( 250 ) NULL ,
+PRIMARY KEY ( `poll_id` ))");
+?>

--- /dev/null
+++ b/blocks/poll/poll.php
@@ -1,1 +1,81 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// http://efiction.hugosnebula.com
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+if(!defined("_CHARSET")) exit( );
 
+global $language;
+
+if(file_exists(_BASEDIR."blocks/poll/{$language}.php")) include_once(_BASEDIR."blocks/poll/{$language}.php");
+else include_once(_BASEDIR."blocks/poll/en.php");
+$content = "";
+$pollopts = array();
+$pollquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NULL OR poll_end = 0 ORDER BY poll_id DESC LIMIT 1");
+if($pollquery) $currentpoll = dbassoc($pollquery);
+ 
+if(isset($_POST['cast_vote'])) {
+	$poll = isset($_POST['poll_id']) && isNumber($_POST['poll_id']) ? $_POST['poll_id'] : false;
+	$opt = isset($_POST['opt']) && isNumber($_POST['opt']) ? $_POST['opt'] : false;
+	if(!$poll || !$opt) accessDenied( ); // could only be a hack attempt.
+	$voted = dbquery("SELECT vote_id FROM ".TABLEPREFIX."fanfiction_poll_votes WHERE vote_poll = '".$currentpoll['poll_id']."' AND vote_user = '".USERUID."'");
+	list($voter) = dbrow($voted);
+        if(!$voter) $cast = dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_poll_votes(`vote_user`, `vote_opt`, `vote_poll`) VALUES('".USERUID."', '$opt', '$poll')");
+	if(!empty($cast)) $content .= write_message(_VOTECAST);
+	else $content .= write_message(_ALREADYVOTED);
+}
+
+if(!$currentpoll) $content = "<div style='text-align: center;'>"._NOPOLL."</div>";
+else  {
+	   $pollopts = explode("|#|", $currentpoll['poll_opts']);
+	   $content .= "<div id='poll_question'>".$currentpoll['poll_question']."</div><br />";
+	   if(isMEMBER) {
+		$voted = dbquery("SELECT vote_id FROM ".TABLEPREFIX."fanfiction_poll_votes WHERE vote_poll = '".$currentpoll['poll_id']."' AND vote_user = '".USERUID."'");
+		list($voter) = dbrow($voted);
+           }
+	   if(empty($voter) && isMEMBER) {
+		$content .= "<form name='poll' id='poll' method='POST' action='".$_SERVER['PHP_SELF'].($_SERVER['QUERY_STRING'] ? "?".$_SERVER['QUERY_STRING']  : "")."'>
+			<input type='hidden' name='poll_id' value='".$currentpoll['poll_id']."'>";
+		   $x = 1;
+		   foreach($pollopts as $opt) {
+		       $content .= "<input type='radio' name='opt' value='$x'> $opt<br />";
+		       $x++;
+		   }
+		   $content .= "<div style='text-align: center;'><input type='submit' id='cast_vote' name='cast_vote' value='"._VOTE."' class='button' style='font-size: 11px;'></div></form>";
+		$content .= write_message("<br /><a href='"._BASEDIR."blocks/poll/pollarchive.php?poll=".$currentpoll['poll_id']."'>"._POLLRESULTS."</a><br /><br />");
+
+	  }
+	  else { 
+		$votes = dbquery("SELECT COUNT(vote_opt) as count, vote_opt FROM ".TABLEPREFIX."fanfiction_poll_votes WHERE vote_poll = '".$currentpoll['poll_id']."' GROUP BY vote_opt  ORDER BY vote_opt");
+
+		if(isset($blocks['poll']['bar']) && file_exists($blocks['poll']['bar'])) $bar = $blocks['poll']['bar'];
+		else $bar = "blocks/poll/bar.jpg";
+		$totalvotes = 0;
+		while($optvotes = dbassoc($votes)) {
+			$results[$optvotes['vote_opt']] = $optvotes['count'];
+			 $totalvotes = $optvotes['count'] ? $optvotes['count'] + $totalvotes : $totalvotes;
+		}
+		foreach($pollopts as $num => $opt) {
+			unset($percent);
+			if(!empty($results[($num + 1)])) $percent = floor(($results[($num + 1)] / $totalvotes) * 100);
+			else $percent = 0;
+			$content .= "<div>$opt <br /> <img src='$bar' alt='".strip_tags($opt)."' height='12' width='".$percent."' class='poll'> $percent%</div>";	
+		}
+	  }
+}
+	$content .= "<div style='text-align: center;'><a href='"._BASEDIR."blocks/poll/pollarchive.php'>"._POLLARCHIVE."</a></div>";
+?>

--- /dev/null
+++ b/blocks/poll/pollarchive.php
@@ -1,1 +1,78 @@
+<?php
+// ----------------------------------------------------------------------
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+$current = "pollarchive";
+
+include ("../../header.php");
+
+if(file_exists(_BASEDIR."blocks/poll/{$language}.php")) include(_BASEDIR."blocks/poll/{$language}.php");
+else include(_BASEDIR."blocks/poll/en.php");
+if(file_exists("$skindir/default.tpl")) $tpl = new TemplatePower( "$skindir/default.tpl" );
+else $tpl = new TemplatePower(_BASEDIR."default_tpls/default.tpl");
+$tpl->assignInclude( "header", "./$skindir/header.tpl" );
+$tpl->assignInclude( "footer", "./$skindir/footer.tpl" );
+//let TemplatePower do its thing, parsing etc.
+$tpl->prepare();
+
+include("../../includes/pagesetup.php");
+
+$poll = !empty($_GET['poll']) && isNumber($_GET['poll']) ? $_GET['poll'] : false;
+
+if($poll) {
+	$pollquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_id = '$poll' ORDER BY poll_id DESC LIMIT 1");
+	$currentpoll = dbassoc($pollquery);
+	$opts = explode("|#|", $currentpoll['poll_opts']);
+	$votes = explode("#", $currentpoll['poll_results']);
+	$output .= "<div id='pagetitle'>"._POLLARCHIVE.": ".$currentpoll['poll_question']."</div><br />";
+	if(isset($blocks['poll']['bar']) && file_exists($blocks['poll']['bar'])) $bar = $blocks['poll']['bar'];
+	else $bar = _BASEDIR."blocks/poll/bar.jpg";
+	$totalvotes = 0;
+	$results = array( );
+	foreach($votes as $opt => $count) {
+		$results[$opt] = $count;
+		 $totalvotes = $count ? $count + $totalvotes : $totalvotes;
+	}
+	$output .= "<div id='story'>";
+	foreach($opts as $num => $opt) {
+		unset($percent);
+		if(!empty($results[$num]) && $results[$num] > 0) $percent = floor(($results[$num] / $totalvotes) * 100);
+		else $percent = 0;
+		$output .= "<div>$opt <br /> <img src='$bar' alt='".strip_tags($opt)."' height='12' class='poll' width='".$percent."'> $percent%</div>";	
+	}
+	$output .= "</diV>";
+}
+else {
+	$output .= "<div id='pagetitle'>"._POLLARCHIVE."</div>";
+	$listquery = dbquery("SELECT poll_id, poll_question, poll_start as start, poll_end as end FROM ".TABLEPREFIX."fanfiction_poll WHERE poll_end IS NOT NULL OR poll_end != 0 ORDER BY poll_id DESC");
+	if(dbnumrows($listquery) > 0) {
+		$output .= "<table class='tblborder' style='margin: 1em auto;'><tr><th class='tblborder'>"._POLLARCHQUESTION."</th><th class='tblborder'>"._START."</th><th class='tblborder'>"._END."</th></tr>";
+		while($poll = dbassoc($listquery)) {
+			$output .= "<tr><td class='tblborder'><a href='pollarchive.php?poll=".$poll['poll_id']."'>".$poll['poll_question']."</a></td><td class='tblborder'>".date("$dateformat", $poll['start'])."</td><td class='tblborder'>".date("$dateformat", $poll['end'])."</td></tr>";
+		}
+		$output .= "</table>";
+	}
+}
+$tpl->assign("output", $output);
+$tpl->printToScreen();
+
+?>

--- /dev/null
+++ b/blocks/random/admin.php
@@ -1,1 +1,37 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language;
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'random'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+include("blocks/".$blocks['random']['file']);
+if(!empty($blocks['random']['tpl'])) $tpl->gotoBlock("_ROOT");
+	if(isset($_POST['submit'])) {
+		if($_POST['tpl']) $blocks['random']['tpl'] = 1;
+		else unset($blocks['random']['tpl']);
+		if($_POST['allowtags']) $blocks['random']['allowtags'] = 1;
+		else unset($blocks['random']['allowtags']);
+		if(isset($_POST['sumlength']) && isNumber($_POST['sumlength'])) $blocks['random']['sumlength'] = $_POST['sumlength'];
+		else unset($blocks['random']['sumlength']);
+		$output .= "<div style='text-align: center;'>"._ACTIONSUCCESSFUL."</div>";
+		save_blocks( $blocks );
+	}
+	else  {
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 80%; margin: 1ex auto; text-align: left;\">".(!empty($blocks['random']['tpl']) ? _NATPL : $content)."</div><br /></div>";
+		$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=random\">
+			<label for=\"tpl\">"._BLOCKTYPE.":</label><select class=\"textbox\" name=\"tpl\" id=\"tpl\"><option value=\"0\"".(empty($blocks['random']['tpl']) ? " selected" : "").">"._DEFAULT."</option>
+					<option value=\"1\"".(!empty($blocks['random']['tpl']) ? " selected" : "").">"._USETPL."</option></select><br />
+			<label for=\"allowtags\">"._TAGS.":</label><select class=\"textbox\" name=\"allowtags\" id=\"allowtags\"><option value=\"0\"".(empty($blocks['random']['allowtags']) ? " selected" : "").">"._STRIPTAGS."</option>
+					<option value=\"1\"".(!empty($blocks['random']['allowtags']) ? " selected" : "").">"._ALLOWTAGS."</option></select><br />
+			<label for=\"sumlength\">"._SUMLENGTH.":</label><input type=\"text\" class=\"textbox\" name=\"sumlength\" id=\"sumlength\" size=\"4\" value=\"".(!empty($blocks['random']['sumlength']) ? $blocks['random']['sumlength'] : "")."\"><br />
+			<INPUT type=\"submit\" name=\"submit\" id=\"submit\" class=\"button\" value=\""._SUBMIT."\"></form></div><div style='text-align: center;'>"._SUMNOTE."</div>";
+	}
+?>

--- /dev/null
+++ b/blocks/random/en.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_NATPL", "Not Available. Layout defined in .tpl file.");
+?>

--- /dev/null
+++ b/blocks/random/index.php

--- /dev/null
+++ b/blocks/random/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('random', 'Random Story', '0', 'random/random.php', '');");
+?>

--- /dev/null
+++ b/blocks/random/random.php
@@ -1,1 +1,20 @@
+<?php
 
+if(!defined("_CHARSET")) exit( );
+	$count = 0;
+	$content = "";
+	$use_tpl = isset($blocks['random']['tpl']) && $blocks['random']['tpl'] ? true : false;
+	$limit = isset($blocks['random']['limit']) && $blocks['random']['limit'] > 0 ? $blocks['random']['limit'] : 1;
+	$randomquery = dbquery(_STORYQUERY." ORDER BY rand( ) DESC LIMIT $limit");
+	if($use_tpl && dbnumrows($randomquery) >0) $tpl->newBlock("randomblock");
+	while($stories = dbassoc($randomquery))
+	{
+		if(!isset($blocks['random']['allowtags'])) $stories['summary'] = strip_tags($stories['summary']);
+		$stories['summary'] = truncate_text(stripslashes($stories['summary']), (isset($blocks['random']['sumlength']) ? $blocks['random']['sumlength'] : 75));
+		if(!$use_tpl) $content .= "<div class='randomstory'>".title_link($stories)." "._BY." ".author_link($stories)." ".$ratingslist[$stories['rid']]['name']."<br />".$stories['summary']."</div>";
+		else {
+			include(_BASEDIR."includes/storyblock.php");
+		}
+	}
+	if($use_tpl && dbnumrows($randomquery) >0) $tpl->gotoBlock("_ROOT");	
+?>

--- /dev/null
+++ b/blocks/recent/admin.php
@@ -1,1 +1,41 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+global $language, $numupdated;
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'recent'");
+while($block = dbassoc($blockquery)) {
+	if ($block['block_variables'])
+	{
+		$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	}
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	 $blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+if(empty($blocks['recent']['tpl'])) include("blocks/".$blocks['recent']['file']);
+if(file_exists("blocks/recent/".$language.".php")) include("blocks/recent/".$language.".php");
+else include("blocks/recent/en.php");
+	if(isset($_POST['submit'])) {
+		if(!empty($_POST['tpl'])) $blocks['recent']['tpl'] = 1;
+		else unset($blocks['recent']['tpl']);
+		if(!empty($_POST['allowtags'])) $blocks['recent']['allowtags'] = 1;
+		else unset($blocks['recent']['allowtags']);
+		if(!empty($_POST['sumlength']) && isNumber($_POST['sumlength'])) $blocks['recent']['sumlength'] = $_POST['sumlength'];
+		else unset($blocks['recent']['sumlength']);
+		if(!empty($_POST['num']) && isNumber($_POST['num'])) $blocks['recent']['num'] = $_POST['num'];
+		else $blocks['recent']['num'] = 1;
+		$output .= "<div style='text-align: center;'>"._ACTIONSUCCESSFUL."</div>";
+		save_blocks( $blocks );
+	}
+	else  {
+		$output .= "<div style='text-align: center;'><b>"._CURRENT.":</b><br /><div class=\"tblborder\" style=\"width: 80%; margin: 0 auto; text-align: left;\">".(!empty($blocks['recent']['tpl']) ? _NATPL : $content)."</div><br /></div>";
+		$output .= "<div id='settingsform'><form method=\"POST\" enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&amp;admin=recent\">
+			<div><label for=\"tpl\">"._BLOCKTYPE.":</label><select name=\"tpl\" class=\"textbox\" id=\"tpl\"><option value=\"0\"".(empty($blocks['recent']['tpl']) ? " selected" : "").">"._DEFAULT."</option>
+					<option value=\"1\"".(!empty($blocks['recent']['tpl']) ? " selected" : "").">"._USETPL."</option></select></div>
+			<div><label for=\"allowtags\">"._TAGS.":</label><select name=\"allowtags\" class=\"textbox\" id=\"allowtags\"><option value=\"0\"".(empty($blocks['recent']['allowtags']) ? " selected" : "").">"._STRIPTAGS."</option>
+					<option value=\"1\"".(!empty($blocks['recent']['allowtags']) ? " selected" : "").">"._ALLOWTAGS."</option></select></div>
+			<div><label for=\"sumlength\">"._SUMLENGTH.":</label><input type=\"text\" class=\"textbox\" name=\"sumlength\" id=\"sumlength\" size=\"4\" value=\"".(!empty($blocks['recent']['sumlength']) ? $blocks['recent']['sumlength'] : "")."\"></div>
+			<div><label for=\"num\">"._NUMUPDATED.":</label><input type=\"text\" class=\"textbox\" name=\"num\" id=\"num\" size=\"4\" value=\"".$blocks['recent']['num']."\"></div>
+			<INPUT type=\"submit\" name=\"submit\" class=\"button\" id=\"submit\" value=\""._SUBMIT."\"></form></div><div style='text-align: center;'>"._SUMNOTE."</div>";
+	}
+?>

--- /dev/null
+++ b/blocks/recent/en.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define ("_NUMUPDATED", "Number of stories");
+?>

--- /dev/null
+++ b/blocks/recent/index.php

--- /dev/null
+++ b/blocks/recent/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('recent', 'Most Recent', '0', 'recent/recent.php', '');");
+?>

--- /dev/null
+++ b/blocks/recent/recent.php
@@ -1,1 +1,22 @@
+<?php
+if(!defined("_CHARSET")) exit( );
+	$count = 0;
+	$content = "";
+	$use_tpl = isset($blocks['recent']['tpl']) && $blocks['recent']['tpl'] ? true : false;
+	if(isset($blocks['recent']['num'])) $numupdated = $blocks['recent']['num'];
+	else $numupdated = 1;
+	$result5 = dbquery(_STORYQUERY." ORDER BY stories.updated DESC LIMIT $numupdated");
+	while($stories = dbassoc($result5))
+	{
+		if(!isset($blocks['recent']['allowtags'])) $stories['summary'] = strip_tags($stories['summary']);
+		$stories['summary'] = truncate_text(stripslashes($stories['summary']), (!empty($blocks['recent']['sumlength']) ? $blocks['recent']['sumlength'] : 75));
+		if(!$use_tpl) $content .= "<div class='recentstory'>".title_link($stories)." "._BY." ".author_link($stories)." ".$ratingslist[$stories['rid']]['name']."<br />".stripslashes($stories['summary'])."</div>";
+		else {
+			$tpl->newBlock("recentblock");
+			include(_BASEDIR."includes/storyblock.php");
+		}
 
+	}	
+	if($use_tpl && dbnumrows($result5) >0) $tpl->gotoBlock("_ROOT");	
+	unset($updated, $result5);
+?>

--- /dev/null
+++ b/blocks/search/index.php

--- /dev/null
+++ b/blocks/search/init.php
@@ -1,1 +1,30 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('search', 'Search', '0', 'search/search.php', '');");
+?>

--- /dev/null
+++ b/blocks/search/search.php
@@ -1,1 +1,8 @@
+<?php
+if(!defined("_CHARSET")) exit( );
+	$content = "<form method=\"POST\" id=\"searchblock\" enctype=\"multipart/form-data\" action=\""._BASEDIR."search.php?action=advanced\">
+			<INPUT type=\"text\" class=\"textbox\" name=\"searchterm\" id=\"searchterm\" size=\"15\"> 
+			<INPUT type=\"hidden\" name=\"searchtype\" value=\"advanced\">
+			<INPUT type=\"submit\" class=\"button\" name=\"submit\" value=\""._SEARCH."\"></form>";
 
+?>

--- /dev/null
+++ b/blocks/shoutbox/README.txt
@@ -1,1 +1,32 @@
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
 
+Copyright 2006 by Tammy Keefer.
+
+CSS in the shoutbox block:
+
+#shoutbox_container  - div surrounding the shoutbox content.
+#shoutlist - div surrounding the list of shouts.  Default styling is included 
+in this div to limit the height and force it to scroll.  Default styles are:
+	height: 200px;
+	overflow: auto;
+.sbname - span surrounding the name of the shouter
+.sbdatetime - span surrounding the date/time and admin options
+.sbshout - the shout itself
+#shoutarchive - the link to the shout archive.
+
+
+

--- /dev/null
+++ b/blocks/shoutbox/admin.php
@@ -1,1 +1,95 @@
+<?php
+if(!defined("_CHARSET")) exit( );
+$blockquery = dbquery("SELECT * FROM ".TABLEPREFIX."fanfiction_blocks WHERE block_name = 'shoutbox'");
+while($block = dbassoc($blockquery)) {
+	$blocks[$block['block_name']] = unserialize($block['block_variables']);
+	$blocks[$block['block_name']]['title'] = $block['block_title'];
+	$blocks[$block['block_name']]['file'] = $block['block_file'];
+	$blocks[$block['block_name']]['status'] = $block['block_status'];
+}
+if(file_exists("blocks/shoutbox/{$language}.php")) include_once("blocks/shoutbox/{$language}.php");
+else include_once("blocks/shoutbox/en.php");
+	if(isset($_POST['deleteshouts'])) {
+		$range = time( ) - ($_POST['del_range'] * 86400);
+		$result = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_shoutbox WHERE shout_datestamp < $range");
+		if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+	}
+	if(isset($_GET['delete']) && isNumber($_GET['delete'])) {
+		$delete = dbquery("DELETE FROM ".TABLEPREFIX."fanfiction_shoutbox WHERE shout_id = '$_GET[delete]' LIMIT 1");
+		if($delete) $output .= write_message(_ACTIONSUCCESSFUL);
+	}	
+	if(isset($_GET['shout_id'])) {
+		$output .= "<div class='sectionheader'>"._EDITSHOUT."</div>";
+		if(isset($_POST['submit'])) {
+			$shout_message = trim($_POST['shout_message']);
+			$shout_message = preg_replace("/^(.{200}).*$/", "$1", $shout_message);
+			$shout_message = preg_replace("/[^\s]{25}/", "$1\n", $shout_message);
+			$search = array("\"", "'", "\\", '\"', "\'", "<", ">", "&nbsp;", "\n");
+			$replace = array("&quot;", "&#39;", "&#92;", "&quot;", "&#39;", "&lt;", "&gt;", " ", " ");
+			$shout_message = str_replace($search, $replace, replace_naughty(trim($shout_message)));
+			$shout_message = str_replace("\n", "<br />", $shout_message);
+			$result = dbquery("UPDATE ".TABLEPREFIX."fanfiction_shoutbox SET shout_message = '$shout_message' WHERE shout_id = '".$_GET['shout_id']."' LIMIT 1");
+			if($result) $output .= write_message(_ACTIONSUCCESSFUL);
+		}
+		$shoutquery = dbquery("SELECT shout_message FROM ".TABLEPREFIX."fanfiction_shoutbox WHERE shout_id = '".$_GET['shout_id']."' LIMIT 1");
+		$shout = dbassoc($shoutquery);
+		if($shout) {
+			$output .= "<div style='text-align: center;'>
+<form method=\"POST\"  enctype=\"multipart/form-data\" action=\"admin.php?action=blocks&admin=shoutbox&amp;shout_id=".$_GET['shout_id']."\">
+<div style='text=align: center; margin: 0 auto;'><textarea name='shout_message' id='shout_message' rows='4' class='mceNoEditor' cols='30'>".$shout['shout_message']."</textarea></div>
+<input type='submit' class='button' name='submit' id='submit' value='"._SUBMIT."'>
+</form></div>";
+		}
+		else {
+			$output .= write_error(_NORESULTS);
+		}
+	}
+	if(isset($_POST['submitopts'])) {
+		$blocks['shoutbox']['shoutdate'] = !empty($_POST['customshoutdate']) ? descript(strip_tags($_POST['customshoutdate'])) : descript(strip_tags($_POST['shoutdate']));
+		$blocks['shoutbox']['shoutlimit'] = isset($_POST['shoutlimit']) && isNumber($_POST['shoutlimit']) ? $_POST['shoutlimit'] : 10;
+		$blocks['shoutbox']['guestshouts'] = isset($_POST['guestshouts']) && $_POST['guestshouts'] == _YES ? 1 : 0;
+		save_blocks($blocks);
+	}
+	$defaults = array("m/d/y h:i a", "d/m/y G:i:s", "m-d-y h:i a", "d-m-y G:i:s", "m.d.y h:i a", "d.m.y G:i:s", "M j, Y h:i a", "M j, Y G:i:s", "d M, Y h:i a", "d M, Y G:i:s");
+	$output .= "<form name='shoutopts' method='POST' id='settingsform' action='admin.php?action=blocks&amp;admin=shoutbox'>\n
+<div><label for='shoutdate'>"._SHOUTDATE.":</label><select name='shoutdate' id='shoutdate'><option value=\"\">"._SELECTONE."</option>";
+		foreach($defaults as $d) {
+			$output .= "<option value='$d'".($blocks['shoutbox']['shoutdate'] == $d ? " selected" : "").">".date("$d")."</option>";
+		}
+		$output .= "</select> "._OR." <input type='text' name='customshoutdate' class='textbox' value='".(isset($blocks['shoutbox']['shoutdate']) && !in_array($blocks['shoutbox']['shoutdate'], $defaults) ? $blocks['shoutbox']['shoutdate'] : "")."'> <A HREF='#' class='pophelp'>[?]<span>"._HELP_SHOUTDATEFORMAT."</span></A></div>
+<div><label for='shoutlimit'>"._SHOUTLIMIT.":</label><input type='text' name='shoutlimit' size='1' value='".(isset($blocks['shoutbox']['shoutlimit']) ? $blocks['shoutbox']['shoutlimit'] : "")."'></div>
+<div class='fieldset'><span class='label'>"._GUESTSHOUTS.":</span>\n
+<input type='radio' name='guestshouts' id='guestshouts"._YES."' value='"._YES."'".(!empty($blocks['shoutbox']['guestshouts'])  ? " checked='checked'" : "")."> <label for='guestshouts"._YES."'>"._YES."</label>\n
+<input type='radio' name='guestshouts' id='guestshouts"._YES."' value='"._NO."'".(empty($blocks['shoutbox']['guestshouts'])  ? " checked='checked'" : "")."> <label for='guestshouts"._NO."'>"._NO."</label>\n</div>\n
+<input type='submit' class='button' name='submitopts' id='submit' value='"._SUBMIT."'></form>";
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC");
+$totalshouts = dbnumrows($shouts);
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC LIMIT $offset, $itemsperpage");
+if($totalshouts > 0) {
+	$output .= "<form name='deleteform' method='POST'action='admin.php?action=blocks&amp;admin=shoutbox'>\n
+<div style='text-align: center;'>"._DELETESHOUTS."<select name='del_range' class='textbox'>\n
+<option value='90'>90</option>\n
+<option value='60'>60</option>\n
+<option value='30'>30</option>\n
+<option value='20'>20</option>\n
+<option value='10'>10</option>\n
+</select>"._DAYS."<br />
+<input type='submit' name='deleteshouts' class='button' value='"._DELETE."'></div></form>";
+	$output .= "<div class='sectionheader'>"._SHOUTARCHIVE."</div><div style='width: 80%;margin: 0 auto;'>";
+	if(!empty($blocks['shoutbox']['shoutdate'])) $shoutdate = $blocks['shoutbox']['shoutdate'];
+	else $shoutdate = $dateformat." ".$timeformat;
+	while($shout = dbassoc($shouts)) {
+		if(isNumber($shout['shout_name']) && isset($shout['penname'])) $shoutname = "<a href='viewuser.php?uid=".$shout['shout_name']."'>".$shout['penname']."</a>";
+		else if(isset($shout['shout_name'])) $shoutname = $shout['shout_name'];
+		else $shout = _GUEST; // Just in case.
+		$output .= "
+<div class='tblborder'><span class='sbname'>$shoutname</span><br />\n
+<span class='sbshout'>".stripslashes($shout['shout_message'])."</span><br />\n
+<span class='sbdatetime'>".date("$shoutdate", $shout['shout_datestamp'])." [<a href='admin.php?action=blocks&amp;admin=shoutbox&amp;delete=".$shout['shout_id']."' class='sbadmin'>"._DELETE."</a>] [<a href='admin.php?action=blocks&amp;admin=shoutbox&amp;shout_id=".$shout['shout_id']."' class='sbadmin'>"._EDIT."</a>]</span></div>\n<br />";
+	}
+	$output .= "</div>";
+	if($totalshouts > $itemsperpage) $output .= build_pagelinks("admin.php?action=blocks&amp;admin=shoutbox&amp;", $totalshouts, $offset);
+}
+else $output .= write_message(_NOSHOUTS);
 
+?>

--- /dev/null
+++ b/blocks/shoutbox/archive.php
@@ -1,1 +1,61 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+
+include ("../../header.php");
+
+if(file_exists("$skindir/default.tpl")) $tpl = new TemplatePower( "$skindir/default.tpl" );
+else $tpl = new TemplatePower("../../default_tpls/default.tpl");
+//let TemplatePower do its thing, parsing etc.
+
+include("../../includes/pagesetup.php");
+
+if(file_exists("{$language}.php")) include_once("{$language}.php");
+else include_once("en.php");
+
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC");
+$totalshouts = dbnumrows($shouts);
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC LIMIT $offset, $itemsperpage");
+if(dbnumrows($shouts) > 0) {
+	if(!empty($blocks['shoutbox']['shoutdate'])) $shoutdate = $blocks['shoutbox']['shoutdate'];
+	else $shoutdate = $dateformat." ".$timeformat;
+	$output .= "<div class='sectionheader'>"._SHOUTARCHIVE."</div><div style='width: 80%;margin: 0 auto;'>";
+	while($shout = dbassoc($shouts)) {
+		if(isNumber($shout['shout_name']) && isset($shout['penname'])) $shoutname = "<a href='"._BASEDIR."viewuser.php?uid=".$shout['shout_name']."'>".$shout['penname']."</a>";
+		else if(isset($shout['shout_name'])) $shoutname = $shout['shout_name'];
+		else $shout = _GUEST; // Just in case.
+		$output .= "
+<div class='tblborder'><span class='sbname'>$shoutname</span><br />\n
+<span class='sbshout'>".stripslashes($shout['shout_message'])."</span><br />\n
+<span class='sbdatetime'>".date("$shoutdate", $shout['shout_datestamp'])." [<a href='../../admin.php?action=blocks&amp;admin=shoutbox&amp;delete=".$shout['shout_id']."' class='sbadmin'>"._DELETE."</a>] [<a href='../../admin.php?action=blocks&amp;admin=shoutbox&amp;shout_id=".$shout['shout_id']."' class='sbadmin'>"._EDIT."</a>]</span></div>\n<br />";
+	}
+	$output .= "</div>";
+	if($totalshouts > $itemsperpage) $output .= build_pagelinks("archive.php?", $totalshouts, $offset);
+}
+else $output .= write_message(_NOSHOUTS);
+$tpl->assign("output", "<div id='pagetitle'>"._SHOUTARCHIVE."</div>\n\n$output");
+$tpl->printToScreen();
+
+?>

--- /dev/null
+++ b/blocks/shoutbox/en.php
@@ -1,1 +1,42 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+define("_SHOUT", "Shout");
+define("_NOSHOUTS", "No messages have been posted.");
+if(!defined("_GUEST")) define("_GUEST", "Guest");
+define("_EDITSHOUT", "Edit Shout");
+define("_SHOUTARCHIVE", "Shout Archive");
+define("_DELETESHOUTS", "Delete shouts older than ");
+define("_DAYS", " days.");
+define("_SHOUTDATE", "Shout Date Format");
+define("_SHOUTLIMIT", "Shout Limit");
+define("_GUESTSHOUTS", "Allow guests to shout");
+define("_SHOUTEND", "End of shout.  Shouts are limited to 200 characters!");
+
+define("_HELP_SHOUTDATEFORMAT", "The format for date (and optionally time) to be displayed in the shout box.  For custom fomats, use PHP's date format.");
+?>

--- /dev/null
+++ b/blocks/shoutbox/index.php

--- /dev/null
+++ b/blocks/shoutbox/init.php
@@ -1,1 +1,37 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('shoutbox', 'Shoutbox', '0', 'shoutbox/shoutbox.php', 'a:3:{s:9:\"shoutdate\";s:11:\"m/d/y h:i a\";s:10:\"shoutlimit\";s:2:\"10\";s:11:\"guestshouts\";i:1;}');");
+dbquery("CREATE TABLE IF NOT EXISTS `".TABLEPREFIX."fanfiction_shoutbox` (
+  `shout_id` smallint(5) unsigned NOT NULL auto_increment,
+  `shout_name` varchar(50) NOT NULL default '',
+  `shout_message` varchar(200) NOT NULL default '',
+  `shout_datestamp` int(10) unsigned NOT NULL default '0',
+  PRIMARY KEY  (`shout_id`)
+) ENGINE=MyISAM;");
+?>

--- /dev/null
+++ b/blocks/shoutbox/shoutbox.php
@@ -1,1 +1,85 @@
+<?php
+if(!defined("_CHARSET")) exit( );
 
+if(file_exists(_BASEDIR."blocks/shoutbox/{$language}.php")) include_once(_BASEDIR."blocks/shoutbox/{$language}.php");
+else include_once(_BASEDIR."blocks/shoutbox/en.php");
+$content = "";
+if(isset($_POST['shouthidden']) && (isMEMBER || !empty($blocks['shoutbox']['guestshouts']))) {
+	http_response_code(202);
+	if(isMEMBER) $shout_name = USERUID;
+	else {
+		$shout_name = trim(descript($_POST['shoutname']));
+		if(isNumber($shout_name)) $shout_name = _GUEST;
+		if($captcha && !captcha_confirm()) $shout_name = false;
+	}
+	$shout_message = trim($_POST['shout_message']);
+	$shout_message = preg_replace("/^(.{200}).*$/", "$1", $shout_message);
+	$shout_message = preg_replace("/[^\s]{25}/", "$1\n", $shout_message);
+	$search = array("\"", "'", "\\", '\"', "\'", "<", ">", "&nbsp;", "\n");
+	$replace = array("&quot;", "&#39;", "&#92;", "&quot;", "&#39;", "&lt;", "&gt;", " ", " ");
+	$shout_message = str_replace($search, $replace, replace_naughty(trim($shout_message)));
+	$shout_message = str_replace("\n", "<br />", $shout_message);
+	if(!empty($shout_name) && !empty($shout_message)) {
+		dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_shoutbox(`shout_name`, `shout_message`, `shout_datestamp`) VALUES('$shout_name', '$shout_message', '".time()."')");
+	}
+
+}
+if(isMEMBER || !empty($blocks['shoutbox']['guestshouts'])) {
+	$content = "<script src=\"https://ajax.googleapis.com/ajax/libs/jquery/3.4.1/jquery.min.js\"></script>
+	<script language=\"javascript\" type=\"text/javascript\">
+	$(document).ready(function() {
+		$(function () {
+		  $('#shout').click( function () {
+			$.ajax({
+			  type: 'post',
+			  url: $('#shoutbox').attr('action'),
+			  data: $('#shoutbox').serialize(),
+			  success: function () {
+				location.reload();
+				$('#shout_message').val(\"\");
+			  }
+			});
+		  });
+		});
+	});
+var shoutend = '"._SHOUTEND."';
+function ismaxlength(obj){
+var mlength = 200
+shout_messagelength = document.shoutbox.shout_message.value.length;
+document.shoutbox.counter.value = 200 - shout_messagelength;
+if (document.shoutbox.shout_message.value.length >= mlength) {
+   alert(shoutend);
+   document.shoutbox.shout_message.value = document.shoutbox.shout_message.value.substr(0, mlength)
+}
+}
+
+</script><div id='shoutbox_container' style='width: 100%;'>\n<form name='shoutbox' id='shoutbox' method='POST' action='".$_SERVER['SCRIPT_NAME'].($_SERVER['QUERY_STRING'] ? "?".$_SERVER['QUERY_STRING']  : "")."'>\n";
+	if(!isMEMBER) $content .= "<div><label for='shoutname'>"._NAME.":</label> <input type='text' name='shoutname' value='' style='display: block; width: 90%; margin: 0 auto;' maxlength='30'></div>";
+	else $content .= "<div><span class='label'>"._NAME.":</span> ".USERPENNAME."</div>";
+	if(!isMEMBER && $captcha) $content .= "<div><label for='userdigit'>"._CAPTCHANOTE."</label><input MAXLENGTH=5 SIZE=5 name=\"userdigit\" type=\"text\" value=\"\"><div style='text-align: center;'><img width=120 height=40 src=\""._BASEDIR."includes/button.php\" style=\"border: 1px solid #111;\"></div></div>";
+	$content .= "<div><label for='shout_MESSAGE'>"._SHOUT.":</label> <textarea name='shout_message' class='mceNoEditor' id='shout_message' rows='4' cols='15' maxlength='200' style='display: block; width: 90%; margin: 0 auto;' onkeyDown='return ismaxlength(this)'></textarea></div> <input type='button' name='shout' id='shout' value='"._SHOUT."'> <input size='1' class='small' type='text' id='counter' value='200'> <input type='hidden' name='shouthidden' id='shouthidden' value='"._SHOUT."'>
+	</form></div>";
+}
+if(isset($blocks['shoutbox']['shoutlimit'])) $shoutlimit = $blocks['shoutbox']['shoutlimit'];
+else $shoutlimit = 10;
+if(!empty($blocks['shoutbox']['shoutdate'])) $shoutdate = $blocks['shoutbox']['shoutdate'];
+else $shoutdate = $dateformat." ".$timeformat;
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC");
+$totalshouts = dbnumrows($shouts);
+$shouts = dbquery("SELECT shouts.*, "._PENNAMEFIELD." as penname FROM ".TABLEPREFIX."fanfiction_shoutbox as shouts LEFT JOIN "._AUTHORTABLE." ON "._UIDFIELD." = shouts.shout_name ORDER BY shout_datestamp DESC LIMIT 0, ".$shoutlimit);
+$content .= "<div id='shoutlist' style='height: 200px; overflow: auto;'>";
+if(dbnumrows($shouts) != 0) {
+	while($shout = dbassoc($shouts)) {
+		if(isNumber($shout['shout_name']) && isset($shout['penname'])) $shoutname = "<a href='"._BASEDIR."viewuser.php?uid=".$shout['shout_name']."'>".$shout['penname']."</a>";
+		else if(isset($shout['shout_name'])) $shoutname = $shout['shout_name'];
+		else $shout = _GUEST; // Just in case.
+		$content .= "<span class='sbname'>$shoutname</span><br /><span class='sbdatetime'>".date("$shoutdate", $shout['shout_datestamp']);
+		if(isADMIN) $content .= " [<a href='"._BASEDIR."admin.php?action=blocks&amp;admin=shoutbox&amp;shout_id=".$shout['shout_id']."' class='sbadmin'>"._EDIT."</a>]";
+		$content .= "</span><br />\n<span class='sbshout'>".stripslashes($shout['shout_message'])."</span><br />";
+	}
+}
+else $content .= write_message(_NOSHOUTS);
+$content .= "</div>";
+if($totalshouts > $shoutlimit) $content .= write_message("<a href='"._BASEDIR."blocks/shoutbox/archive.php'>"._SHOUTARCHIVE."</a>");
+?>
+

--- /dev/null
+++ b/blocks/skinchange/index.php

--- /dev/null
+++ b/blocks/skinchange/init.php
@@ -1,1 +1,31 @@
+<?php
 
+// ----------------------------------------------------------------------
+// eFiction 3.2
+// Copyright (c) 2007 by Tammy Keefer
+// Valid HTML 4.01 Transitional
+// Based on eFiction 1.1
+// Copyright (C) 2003 by Rebecca Smallwood.
+// http://efiction.sourceforge.net/
+// ----------------------------------------------------------------------
+// LICENSE
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License (GPL)
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// To read the license please visit http://www.gnu.org/copyleft/gpl.html
+// ----------------------------------------------------------------------
+
+if(!defined("_CHARSET")) exit( );
+
+
+dbquery("INSERT INTO ".TABLEPREFIX."fanfiction_blocks(`block_name`, `block_title`, `block_status`, `block_file`, `block_variables`) VALUES('skinchange', 'Skin Selection', '0', 'skinchange/skinchange.php', '');");
+$blocks["skinchange"] = array("title" => "", "status" => "0", "file" => "skinchange/skinchange.php");
+?>