From c1e4c31f199d851f1f7626198d9d00ad0399e4db 2017-06-12 18:57:18
From: DarkMorford <DarkMorford@Gmail.com>
Date: 2017-06-12 18:57:18
Subject: [PATCH] Add most necessary files for admin interface.

---

diff --git a/.htaccess b/.htaccess
new file mode 100644
index 0000000..2ebeb60
--- /dev/null
+++ b/.htaccess
@@ -0,0 +1,3 @@
+RewriteEngine On
+
+RewriteRule ^(.*)\.xml$ rss-$1.php
diff --git a/CalendarPopup.js b/CalendarPopup.js
new file mode 100644
index 0000000..acb306e
--- /dev/null
+++ b/CalendarPopup.js
@@ -0,0 +1,1465 @@
+// ===================================================================
+// Author: Matt Kruse <matt@mattkruse.com>
+// WWW: http://www.mattkruse.com/
+//
+// NOTICE: You may use this code for any purpose, commercial or
+// private, without any further permission from the author. You may
+// remove this notice from your final code if you wish, however it is
+// appreciated by the author if at least my web site address is kept.
+//
+// You may *NOT* re-distribute this code in any way except through its
+// use. That means, you can include it in your product, or your web
+// site, or any other form where the code is actually being used. You
+// may not put the plain javascript up on your site for download or
+// include it in your javascript libraries for download. 
+// If you wish to share this code with others, please just point them
+// to the URL instead.
+// Please DO NOT link directly to my .js files from your site. Copy
+// the files to your server and use them there. Thank you.
+// ===================================================================
+
+
+/* SOURCE FILE: AnchorPosition.js */
+
+/* 
+AnchorPosition.js
+Author: Matt Kruse
+Last modified: 10/11/02
+
+DESCRIPTION: These functions find the position of an <A> tag in a document,
+so other elements can be positioned relative to it.
+
+COMPATABILITY: Netscape 4.x,6.x,Mozilla, IE 5.x,6.x on Windows. Some small
+positioning errors - usually with Window positioning - occur on the 
+Macintosh platform.
+
+FUNCTIONS:
+getAnchorPosition(anchorname)
+  Returns an Object() having .x and .y properties of the pixel coordinates
+  of the upper-left corner of the anchor. Position is relative to the PAGE.
+
+getAnchorWindowPosition(anchorname)
+  Returns an Object() having .x and .y properties of the pixel coordinates
+  of the upper-left corner of the anchor, relative to the WHOLE SCREEN.
+
+NOTES:
+
+1) For popping up separate browser windows, use getAnchorWindowPosition. 
+   Otherwise, use getAnchorPosition
+
+2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+   same. For example:
+   <A NAME="test" ID="test"> </A>
+
+3) There must be at least a space between <A> </A> for IE5.5 to see the 
+   anchor tag correctly. Do not do <A></A> with no space.
+*/ 
+
+// getAnchorPosition(anchorname)
+//   This function returns an object having .x and .y properties which are the coordinates
+//   of the named anchor, relative to the page.
+function getAnchorPosition(anchorname) {
+	// This function will return an Object with x and y properties
+	var useWindow=false;
+	var coordinates=new Object();
+	var x=0,y=0;
+	// Browser capability sniffing
+	var use_gebi=false, use_css=false, use_layers=false;
+	if (document.getElementById) { use_gebi=true; }
+	else if (document.all) { use_css=true; }
+	else if (document.layers) { use_layers=true; }
+	// Logic to find position
+ 	if (use_gebi && document.all) {
+		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
+		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
+		}
+	else if (use_gebi) {
+		var o=document.getElementById(anchorname);
+		x=AnchorPosition_getPageOffsetLeft(o);
+		y=AnchorPosition_getPageOffsetTop(o);
+		}
+ 	else if (use_css) {
+		x=AnchorPosition_getPageOffsetLeft(document.all[anchorname]);
+		y=AnchorPosition_getPageOffsetTop(document.all[anchorname]);
+		}
+	else if (use_layers) {
+		var found=0;
+		for (var i=0; i<document.anchors.length; i++) {
+			if (document.anchors[i].name==anchorname) { found=1; break; }
+			}
+		if (found==0) {
+			coordinates.x=0; coordinates.y=0; return coordinates;
+			}
+		x=document.anchors[i].x;
+		y=document.anchors[i].y;
+		}
+	else {
+		coordinates.x=0; coordinates.y=0; return coordinates;
+		}
+	coordinates.x=x;
+	coordinates.y=y;
+	return coordinates;
+	}
+
+// getAnchorWindowPosition(anchorname)
+//   This function returns an object having .x and .y properties which are the coordinates
+//   of the named anchor, relative to the window
+function getAnchorWindowPosition(anchorname) {
+	var coordinates=getAnchorPosition(anchorname);
+	var x=0;
+	var y=0;
+	if (document.getElementById) {
+		if (isNaN(window.screenX)) {
+			x=coordinates.x-document.body.scrollLeft+window.screenLeft;
+			y=coordinates.y-document.body.scrollTop+window.screenTop;
+			}
+		else {
+			x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
+			y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
+			}
+		}
+	else if (document.all) {
+		x=coordinates.x-document.body.scrollLeft+window.screenLeft;
+		y=coordinates.y-document.body.scrollTop+window.screenTop;
+		}
+	else if (document.layers) {
+		x=coordinates.x+window.screenX+(window.outerWidth-window.innerWidth)-window.pageXOffset;
+		y=coordinates.y+window.screenY+(window.outerHeight-24-window.innerHeight)-window.pageYOffset;
+		}
+	coordinates.x=x;
+	coordinates.y=y;
+	return coordinates;
+	}
+
+// Functions for IE to get position of an object
+function AnchorPosition_getPageOffsetLeft (el) {
+	var ol=el.offsetLeft;
+	while ((el=el.offsetParent) != null) { ol += el.offsetLeft; }
+	return ol;
+	}
+function AnchorPosition_getWindowOffsetLeft (el) {
+	return AnchorPosition_getPageOffsetLeft(el)-document.body.scrollLeft;
+	}	
+function AnchorPosition_getPageOffsetTop (el) {
+	var ot=el.offsetTop;
+	while((el=el.offsetParent) != null) { ot += el.offsetTop; }
+	return ot;
+	}
+function AnchorPosition_getWindowOffsetTop (el) {
+	return AnchorPosition_getPageOffsetTop(el)-document.body.scrollTop;
+	}
+
+/* SOURCE FILE: date.js */
+
+// HISTORY
+// ------------------------------------------------------------------
+// May 17, 2003: Fixed bug in parseDate() for dates <1970
+// March 11, 2003: Added parseDate() function
+// March 11, 2003: Added "NNN" formatting option. Doesn't match up
+//                 perfectly with SimpleDateFormat formats, but 
+//                 backwards-compatability was required.
+
+// ------------------------------------------------------------------
+// These functions use the same 'format' strings as the 
+// java.text.SimpleDateFormat class, with minor exceptions.
+// The format string consists of the following abbreviations:
+// 
+// Field        | Full Form          | Short Form
+// -------------+--------------------+-----------------------
+// Year         | yyyy (4 digits)    | yy (2 digits), y (2 or 4 digits)
+// Month        | MMM (name or abbr.)| MM (2 digits), M (1 or 2 digits)
+//              | NNN (abbr.)        |
+// Day of Month | dd (2 digits)      | d (1 or 2 digits)
+// Day of Week  | EE (name)          | E (abbr)
+// Hour (1-12)  | hh (2 digits)      | h (1 or 2 digits)
+// Hour (0-23)  | HH (2 digits)      | H (1 or 2 digits)
+// Hour (0-11)  | KK (2 digits)      | K (1 or 2 digits)
+// Hour (1-24)  | kk (2 digits)      | k (1 or 2 digits)
+// Minute       | mm (2 digits)      | m (1 or 2 digits)
+// Second       | ss (2 digits)      | s (1 or 2 digits)
+// AM/PM        | a                  |
+//
+// NOTE THE DIFFERENCE BETWEEN MM and mm! Month=MM, not mm!
+// Examples:
+//  "MMM d, y" matches: January 01, 2000
+//                      Dec 1, 1900
+//                      Nov 20, 00
+//  "M/d/yy"   matches: 01/20/00
+//                      9/2/00
+//  "MMM dd, yyyy hh:mm:ssa" matches: "January 01, 2000 12:30:45AM"
+// ------------------------------------------------------------------
+
+var MONTH_NAMES=new Array('January','February','March','April','May','June','July','August','September','October','November','December','Jan','Feb','Mar','Apr','May','Jun','Jul','Aug','Sep','Oct','Nov','Dec');
+var DAY_NAMES=new Array('Sunday','Monday','Tuesday','Wednesday','Thursday','Friday','Saturday','Sun','Mon','Tue','Wed','Thu','Fri','Sat');
+function LZ(x) {return(x<0||x>9?"":"0")+x}
+
+// ------------------------------------------------------------------
+// isDate ( date_string, format_string )
+// Returns true if date string matches format of format string and
+// is a valid date. Else returns false.
+// It is recommended that you trim whitespace around the value before
+// passing it to this function, as whitespace is NOT ignored!
+// ------------------------------------------------------------------
+function isDate(val,format) {
+	var date=getDateFromFormat(val,format);
+	if (date==0) { return false; }
+	return true;
+	}
+
+// -------------------------------------------------------------------
+// compareDates(date1,date1format,date2,date2format)
+//   Compare two date strings to see which is greater.
+//   Returns:
+//   1 if date1 is greater than date2
+//   0 if date2 is greater than date1 of if they are the same
+//  -1 if either of the dates is in an invalid format
+// -------------------------------------------------------------------
+function compareDates(date1,dateformat1,date2,dateformat2) {
+	var d1=getDateFromFormat(date1,dateformat1);
+	var d2=getDateFromFormat(date2,dateformat2);
+	if (d1==0 || d2==0) {
+		return -1;
+		}
+	else if (d1 > d2) {
+		return 1;
+		}
+	return 0;
+	}
+
+// ------------------------------------------------------------------
+// formatDate (date_object, format)
+// Returns a date in the output format specified.
+// The format string uses the same abbreviations as in getDateFromFormat()
+// ------------------------------------------------------------------
+function formatDate(date,format) {
+	format=format+"";
+	var result="";
+	var i_format=0;
+	var c="";
+	var token="";
+	var y=date.getYear()+"";
+	var M=date.getMonth()+1;
+	var d=date.getDate();
+	var E=date.getDay();
+	var H=date.getHours();
+	var m=date.getMinutes();
+	var s=date.getSeconds();
+	var yyyy,yy,MMM,MM,dd,hh,h,mm,ss,ampm,HH,H,KK,K,kk,k;
+	// Convert real date parts into formatted versions
+	var value=new Object();
+	if (y.length < 4) {y=""+(y-0+1900);}
+	value["y"]=""+y;
+	value["yyyy"]=y;
+	value["yy"]=y.substring(2,4);
+	value["M"]=M;
+	value["MM"]=LZ(M);
+	value["MMM"]=MONTH_NAMES[M-1];
+	value["NNN"]=MONTH_NAMES[M+11];
+	value["d"]=d;
+	value["dd"]=LZ(d);
+	value["E"]=DAY_NAMES[E+7];
+	value["EE"]=DAY_NAMES[E];
+	value["H"]=H;
+	value["HH"]=LZ(H);
+	if (H==0){value["h"]=12;}
+	else if (H>12){value["h"]=H-12;}
+	else {value["h"]=H;}
+	value["hh"]=LZ(value["h"]);
+	if (H>11){value["K"]=H-12;} else {value["K"]=H;}
+	value["k"]=H+1;
+	value["KK"]=LZ(value["K"]);
+	value["kk"]=LZ(value["k"]);
+	if (H > 11) { value["a"]="PM"; }
+	else { value["a"]="AM"; }
+	value["m"]=m;
+	value["mm"]=LZ(m);
+	value["s"]=s;
+	value["ss"]=LZ(s);
+	while (i_format < format.length) {
+		c=format.charAt(i_format);
+		token="";
+		while ((format.charAt(i_format)==c) && (i_format < format.length)) {
+			token += format.charAt(i_format++);
+			}
+		if (value[token] != null) { result=result + value[token]; }
+		else { result=result + token; }
+		}
+	return result;
+	}
+	
+// ------------------------------------------------------------------
+// Utility functions for parsing in getDateFromFormat()
+// ------------------------------------------------------------------
+function _isInteger(val) {
+	var digits="1234567890";
+	for (var i=0; i < val.length; i++) {
+		if (digits.indexOf(val.charAt(i))==-1) { return false; }
+		}
+	return true;
+	}
+function _getInt(str,i,minlength,maxlength) {
+	for (var x=maxlength; x>=minlength; x--) {
+		var token=str.substring(i,i+x);
+		if (token.length < minlength) { return null; }
+		if (_isInteger(token)) { return token; }
+		}
+	return null;
+	}
+	
+// ------------------------------------------------------------------
+// getDateFromFormat( date_string , format_string )
+//
+// This function takes a date string and a format string. It matches
+// If the date string matches the format string, it returns the 
+// getTime() of the date. If it does not match, it returns 0.
+// ------------------------------------------------------------------
+function getDateFromFormat(val,format) {
+	val=val+"";
+	format=format+"";
+	var i_val=0;
+	var i_format=0;
+	var c="";
+	var token="";
+	var token2="";
+	var x,y;
+	var now=new Date();
+	var year=now.getYear();
+	var month=now.getMonth()+1;
+	var date=1;
+	var hh=now.getHours();
+	var mm=now.getMinutes();
+	var ss=now.getSeconds();
+	var ampm="";
+	
+	while (i_format < format.length) {
+		// Get next token from format string
+		c=format.charAt(i_format);
+		token="";
+		while ((format.charAt(i_format)==c) && (i_format < format.length)) {
+			token += format.charAt(i_format++);
+			}
+		// Extract contents of value based on format token
+		if (token=="yyyy" || token=="yy" || token=="y") {
+			if (token=="yyyy") { x=4;y=4; }
+			if (token=="yy")   { x=2;y=2; }
+			if (token=="y")    { x=2;y=4; }
+			year=_getInt(val,i_val,x,y);
+			if (year==null) { return 0; }
+			i_val += year.length;
+			if (year.length==2) {
+				if (year > 70) { year=1900+(year-0); }
+				else { year=2000+(year-0); }
+				}
+			}
+		else if (token=="MMM"||token=="NNN"){
+			month=0;
+			for (var i=0; i<MONTH_NAMES.length; i++) {
+				var month_name=MONTH_NAMES[i];
+				if (val.substring(i_val,i_val+month_name.length).toLowerCase()==month_name.toLowerCase()) {
+					if (token=="MMM"||(token=="NNN"&&i>11)) {
+						month=i+1;
+						if (month>12) { month -= 12; }
+						i_val += month_name.length;
+						break;
+						}
+					}
+				}
+			if ((month < 1)||(month>12)){return 0;}
+			}
+		else if (token=="EE"||token=="E"){
+			for (var i=0; i<DAY_NAMES.length; i++) {
+				var day_name=DAY_NAMES[i];
+				if (val.substring(i_val,i_val+day_name.length).toLowerCase()==day_name.toLowerCase()) {
+					i_val += day_name.length;
+					break;
+					}
+				}
+			}
+		else if (token=="MM"||token=="M") {
+			month=_getInt(val,i_val,token.length,2);
+			if(month==null||(month<1)||(month>12)){return 0;}
+			i_val+=month.length;}
+		else if (token=="dd"||token=="d") {
+			date=_getInt(val,i_val,token.length,2);
+			if(date==null||(date<1)||(date>31)){return 0;}
+			i_val+=date.length;}
+		else if (token=="hh"||token=="h") {
+			hh=_getInt(val,i_val,token.length,2);
+			if(hh==null||(hh<1)||(hh>12)){return 0;}
+			i_val+=hh.length;}
+		else if (token=="HH"||token=="H") {
+			hh=_getInt(val,i_val,token.length,2);
+			if(hh==null||(hh<0)||(hh>23)){return 0;}
+			i_val+=hh.length;}
+		else if (token=="KK"||token=="K") {
+			hh=_getInt(val,i_val,token.length,2);
+			if(hh==null||(hh<0)||(hh>11)){return 0;}
+			i_val+=hh.length;}
+		else if (token=="kk"||token=="k") {
+			hh=_getInt(val,i_val,token.length,2);
+			if(hh==null||(hh<1)||(hh>24)){return 0;}
+			i_val+=hh.length;hh--;}
+		else if (token=="mm"||token=="m") {
+			mm=_getInt(val,i_val,token.length,2);
+			if(mm==null||(mm<0)||(mm>59)){return 0;}
+			i_val+=mm.length;}
+		else if (token=="ss"||token=="s") {
+			ss=_getInt(val,i_val,token.length,2);
+			if(ss==null||(ss<0)||(ss>59)){return 0;}
+			i_val+=ss.length;}
+		else if (token=="a") {
+			if (val.substring(i_val,i_val+2).toLowerCase()=="am") {ampm="AM";}
+			else if (val.substring(i_val,i_val+2).toLowerCase()=="pm") {ampm="PM";}
+			else {return 0;}
+			i_val+=2;}
+		else {
+			if (val.substring(i_val,i_val+token.length)!=token) {return 0;}
+			else {i_val+=token.length;}
+			}
+		}
+	// If there are any trailing characters left in the value, it doesn't match
+	if (i_val != val.length) { return 0; }
+	// Is date valid for month?
+	if (month==2) {
+		// Check for leap year
+		if ( ( (year%4==0)&&(year%100 != 0) ) || (year%400==0) ) { // leap year
+			if (date > 29){ return 0; }
+			}
+		else { if (date > 28) { return 0; } }
+		}
+	if ((month==4)||(month==6)||(month==9)||(month==11)) {
+		if (date > 30) { return 0; }
+		}
+	// Correct hours value
+	if (hh<12 && ampm=="PM") { hh=hh-0+12; }
+	else if (hh>11 && ampm=="AM") { hh-=12; }
+	var newdate=new Date(year,month-1,date,hh,mm,ss);
+	return newdate.getTime();
+	}
+
+// ------------------------------------------------------------------
+// parseDate( date_string [, prefer_euro_format] )
+//
+// This function takes a date string and tries to match it to a
+// number of possible date formats to get the value. It will try to
+// match against the following international formats, in this order:
+// y-M-d   MMM d, y   MMM d,y   y-MMM-d   d-MMM-y  MMM d
+// M/d/y   M-d-y      M.d.y     MMM-d     M/d      M-d
+// d/M/y   d-M-y      d.M.y     d-MMM     d/M      d-M
+// A second argument may be passed to instruct the method to search
+// for formats like d/M/y (european format) before M/d/y (American).
+// Returns a Date object or null if no patterns match.
+// ------------------------------------------------------------------
+function parseDate(val) {
+	var preferEuro=(arguments.length==2)?arguments[1]:false;
+	generalFormats=new Array('y-M-d','MMM d, y','MMM d,y','y-MMM-d','d-MMM-y','MMM d');
+	monthFirst=new Array('M/d/y','M-d-y','M.d.y','MMM-d','M/d','M-d');
+	dateFirst =new Array('d/M/y','d-M-y','d.M.y','d-MMM','d/M','d-M');
+	var checkList=new Array('generalFormats',preferEuro?'dateFirst':'monthFirst',preferEuro?'monthFirst':'dateFirst');
+	var d=null;
+	for (var i=0; i<checkList.length; i++) {
+		var l=window[checkList[i]];
+		for (var j=0; j<l.length; j++) {
+			d=getDateFromFormat(val,l[j]);
+			if (d!=0) { return new Date(d); }
+			}
+		}
+	return null;
+	}
+
+/* SOURCE FILE: PopupWindow.js */
+
+/* 
+PopupWindow.js
+Author: Matt Kruse
+Last modified: 02/16/04
+
+DESCRIPTION: This object allows you to easily and quickly popup a window
+in a certain place. The window can either be a DIV or a separate browser
+window.
+
+COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
+positioning errors - usually with Window positioning - occur on the 
+Macintosh platform. Due to bugs in Netscape 4.x, populating the popup 
+window with <STYLE> tags may cause errors.
+
+USAGE:
+// Create an object for a WINDOW popup
+var win = new PopupWindow(); 
+
+// Create an object for a DIV window using the DIV named 'mydiv'
+var win = new PopupWindow('mydiv'); 
+
+// Set the window to automatically hide itself when the user clicks 
+// anywhere else on the page except the popup
+win.autoHide(); 
+
+// Show the window relative to the anchor name passed in
+win.showPopup(anchorname);
+
+// Hide the popup
+win.hidePopup();
+
+// Set the size of the popup window (only applies to WINDOW popups
+win.setSize(width,height);
+
+// Populate the contents of the popup window that will be shown. If you 
+// change the contents while it is displayed, you will need to refresh()
+win.populate(string);
+
+// set the URL of the window, rather than populating its contents
+// manually
+win.setUrl("http://www.site.com/");
+
+// Refresh the contents of the popup
+win.refresh();
+
+// Specify how many pixels to the right of the anchor the popup will appear
+win.offsetX = 50;
+
+// Specify how many pixels below the anchor the popup will appear
+win.offsetY = 100;
+
+NOTES:
+1) Requires the functions in AnchorPosition.js
+
+2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+   same. For example:
+   <A NAME="test" ID="test"> </A>
+
+3) There must be at least a space between <A> </A> for IE5.5 to see the 
+   anchor tag correctly. Do not do <A></A> with no space.
+
+4) When a PopupWindow object is created, a handler for 'onmouseup' is
+   attached to any event handler you may have already defined. Do NOT define
+   an event handler for 'onmouseup' after you define a PopupWindow object or
+   the autoHide() will not work correctly.
+*/ 
+
+// Set the position of the popup window based on the anchor
+function PopupWindow_getXYPosition(anchorname) {
+	var coordinates;
+	if (this.type == "WINDOW") {
+		coordinates = getAnchorWindowPosition(anchorname);
+		}
+	else {
+		coordinates = getAnchorPosition(anchorname);
+		}
+	this.x = coordinates.x;
+	this.y = coordinates.y;
+	}
+// Set width/height of DIV/popup window
+function PopupWindow_setSize(width,height) {
+	this.width = width;
+	this.height = height;
+	}
+// Fill the window with contents
+function PopupWindow_populate(contents) {
+	this.contents = contents;
+	this.populated = false;
+	}
+// Set the URL to go to
+function PopupWindow_setUrl(url) {
+	this.url = url;
+	}
+// Set the window popup properties
+function PopupWindow_setWindowProperties(props) {
+	this.windowProperties = props;
+	}
+// Refresh the displayed contents of the popup
+function PopupWindow_refresh() {
+	if (this.divName != null) {
+		// refresh the DIV object
+		if (this.use_gebi) {
+			document.getElementById(this.divName).innerHTML = this.contents;
+			}
+		else if (this.use_css) { 
+			document.all[this.divName].innerHTML = this.contents;
+			}
+		else if (this.use_layers) { 
+			var d = document.layers[this.divName]; 
+			d.document.open();
+			d.document.writeln(this.contents);
+			d.document.close();
+			}
+		}
+	else {
+		if (this.popupWindow != null && !this.popupWindow.closed) {
+			if (this.url!="") {
+				this.popupWindow.location.href=this.url;
+				}
+			else {
+				this.popupWindow.document.open();
+				this.popupWindow.document.writeln(this.contents);
+				this.popupWindow.document.close();
+			}
+			this.popupWindow.focus();
+			}
+		}
+	}
+// Position and show the popup, relative to an anchor object
+function PopupWindow_showPopup(anchorname) {
+	this.getXYPosition(anchorname);
+	this.x += this.offsetX;
+	this.y += this.offsetY;
+	if (!this.populated && (this.contents != "")) {
+		this.populated = true;
+		this.refresh();
+		}
+	if (this.divName != null) {
+		// Show the DIV object
+		if (this.use_gebi) {
+			document.getElementById(this.divName).style.left = this.x + "px";
+			document.getElementById(this.divName).style.top = this.y + "px";
+			document.getElementById(this.divName).style.visibility = "visible";
+			}
+		else if (this.use_css) {
+			document.all[this.divName].style.left = this.x;
+			document.all[this.divName].style.top = this.y;
+			document.all[this.divName].style.visibility = "visible";
+			}
+		else if (this.use_layers) {
+			document.layers[this.divName].left = this.x;
+			document.layers[this.divName].top = this.y;
+			document.layers[this.divName].visibility = "visible";
+			}
+		}
+	else {
+		if (this.popupWindow == null || this.popupWindow.closed) {
+			// If the popup window will go off-screen, move it so it doesn't
+			if (this.x<0) { this.x=0; }
+			if (this.y<0) { this.y=0; }
+			if (screen && screen.availHeight) {
+				if ((this.y + this.height) > screen.availHeight) {
+					this.y = screen.availHeight - this.height;
+					}
+				}
+			if (screen && screen.availWidth) {
+				if ((this.x + this.width) > screen.availWidth) {
+					this.x = screen.availWidth - this.width;
+					}
+				}
+			var avoidAboutBlank = window.opera || ( document.layers && !navigator.mimeTypes['*'] ) || navigator.vendor == 'KDE' || ( document.childNodes && !document.all && !navigator.taintEnabled );
+			this.popupWindow = window.open(avoidAboutBlank?"":"about:blank","window_"+anchorname,this.windowProperties+",width="+this.width+",height="+this.height+",screenX="+this.x+",left="+this.x+",screenY="+this.y+",top="+this.y+"");
+			}
+		this.refresh();
+		}
+	}
+// Hide the popup
+function PopupWindow_hidePopup() {
+	if (this.divName != null) {
+		if (this.use_gebi) {
+			document.getElementById(this.divName).style.visibility = "hidden";
+			}
+		else if (this.use_css) {
+			document.all[this.divName].style.visibility = "hidden";
+			}
+		else if (this.use_layers) {
+			document.layers[this.divName].visibility = "hidden";
+			}
+		}
+	else {
+		if (this.popupWindow && !this.popupWindow.closed) {
+			this.popupWindow.close();
+			this.popupWindow = null;
+			}
+		}
+	}
+// Pass an event and return whether or not it was the popup DIV that was clicked
+function PopupWindow_isClicked(e) {
+	if (this.divName != null) {
+		if (this.use_layers) {
+			var clickX = e.pageX;
+			var clickY = e.pageY;
+			var t = document.layers[this.divName];
+			if ((clickX > t.left) && (clickX < t.left+t.clip.width) && (clickY > t.top) && (clickY < t.top+t.clip.height)) {
+				return true;
+				}
+			else { return false; }
+			}
+		else if (document.all) { // Need to hard-code this to trap IE for error-handling
+			var t = window.event.srcElement;
+			while (t.parentElement != null) {
+				if (t.id==this.divName) {
+					return true;
+					}
+				t = t.parentElement;
+				}
+			return false;
+			}
+		else if (this.use_gebi && e) {
+			var t = e.originalTarget;
+			while (t.parentNode != null) {
+				if (t.id==this.divName) {
+					return true;
+					}
+				t = t.parentNode;
+				}
+			return false;
+			}
+		return false;
+		}
+	return false;
+	}
+
+// Check an onMouseDown event to see if we should hide
+function PopupWindow_hideIfNotClicked(e) {
+	if (this.autoHideEnabled && !this.isClicked(e)) {
+		this.hidePopup();
+		}
+	}
+// Call this to make the DIV disable automatically when mouse is clicked outside it
+function PopupWindow_autoHide() {
+	this.autoHideEnabled = true;
+	}
+// This global function checks all PopupWindow objects onmouseup to see if they should be hidden
+function PopupWindow_hidePopupWindows(e) {
+	for (var i=0; i<popupWindowObjects.length; i++) {
+		if (popupWindowObjects[i] != null) {
+			var p = popupWindowObjects[i];
+			p.hideIfNotClicked(e);
+			}
+		}
+	}
+// Run this immediately to attach the event listener
+function PopupWindow_attachListener() {
+	if (document.layers) {
+		document.captureEvents(Event.MOUSEUP);
+		}
+	window.popupWindowOldEventListener = document.onmouseup;
+	if (window.popupWindowOldEventListener != null) {
+		document.onmouseup = new Function("window.popupWindowOldEventListener(); PopupWindow_hidePopupWindows();");
+		}
+	else {
+		document.onmouseup = PopupWindow_hidePopupWindows;
+		}
+	}
+// CONSTRUCTOR for the PopupWindow object
+// Pass it a DIV name to use a DHTML popup, otherwise will default to window popup
+function PopupWindow() {
+	if (!window.popupWindowIndex) { window.popupWindowIndex = 0; }
+	if (!window.popupWindowObjects) { window.popupWindowObjects = new Array(); }
+	if (!window.listenerAttached) {
+		window.listenerAttached = true;
+		PopupWindow_attachListener();
+		}
+	this.index = popupWindowIndex++;
+	popupWindowObjects[this.index] = this;
+	this.divName = null;
+	this.popupWindow = null;
+	this.width=0;
+	this.height=0;
+	this.populated = false;
+	this.visible = false;
+	this.autoHideEnabled = false;
+	
+	this.contents = "";
+	this.url="";
+	this.windowProperties="toolbar=no,location=no,status=no,menubar=no,scrollbars=auto,resizable,alwaysRaised,dependent,titlebar=no";
+	if (arguments.length>0) {
+		this.type="DIV";
+		this.divName = arguments[0];
+		}
+	else {
+		this.type="WINDOW";
+		}
+	this.use_gebi = false;
+	this.use_css = false;
+	this.use_layers = false;
+	if (document.getElementById) { this.use_gebi = true; }
+	else if (document.all) { this.use_css = true; }
+	else if (document.layers) { this.use_layers = true; }
+	else { this.type = "WINDOW"; }
+	this.offsetX = 0;
+	this.offsetY = 0;
+	// Method mappings
+	this.getXYPosition = PopupWindow_getXYPosition;
+	this.populate = PopupWindow_populate;
+	this.setUrl = PopupWindow_setUrl;
+	this.setWindowProperties = PopupWindow_setWindowProperties;
+	this.refresh = PopupWindow_refresh;
+	this.showPopup = PopupWindow_showPopup;
+	this.hidePopup = PopupWindow_hidePopup;
+	this.setSize = PopupWindow_setSize;
+	this.isClicked = PopupWindow_isClicked;
+	this.autoHide = PopupWindow_autoHide;
+	this.hideIfNotClicked = PopupWindow_hideIfNotClicked;
+	}
+
+/* SOURCE FILE: CalendarPopup.js */
+
+// HISTORY
+// ------------------------------------------------------------------
+// Feb 7, 2005: Fixed a CSS styles to use px unit
+// March 29, 2004: Added check in select() method for the form field
+//      being disabled. If it is, just return and don't do anything.
+// March 24, 2004: Fixed bug - when month name and abbreviations were
+//      changed, date format still used original values.
+// January 26, 2004: Added support for drop-down month and year
+//      navigation (Thanks to Chris Reid for the idea)
+// September 22, 2003: Fixed a minor problem in YEAR calendar with
+//      CSS prefix.
+// August 19, 2003: Renamed the function to get styles, and made it
+//      work correctly without an object reference
+// August 18, 2003: Changed showYearNavigation and 
+//      showYearNavigationInput to optionally take an argument of
+//      true or false
+// July 31, 2003: Added text input option for year navigation.
+//      Added a per-calendar CSS prefix option to optionally use 
+//      different styles for different calendars.
+// July 29, 2003: Fixed bug causing the Today link to be clickable 
+//      even though today falls in a disabled date range.
+//      Changed formatting to use pure CSS, allowing greater control
+//      over look-and-feel options.
+// June 11, 2003: Fixed bug causing the Today link to be unselectable
+//      under certain cases when some days of week are disabled
+// March 14, 2003: Added ability to disable individual dates or date
+//      ranges, display as light gray and strike-through
+// March 14, 2003: Removed dependency on graypixel.gif and instead 
+///     use table border coloring
+// March 12, 2003: Modified showCalendar() function to allow optional
+//      start-date parameter
+// March 11, 2003: Modified select() function to allow optional
+//      start-date parameter
+/* 
+DESCRIPTION: This object implements a popup calendar to allow the user to
+select a date, month, quarter, or year.
+
+COMPATABILITY: Works with Netscape 4.x, 6.x, IE 5.x on Windows. Some small
+positioning errors - usually with Window positioning - occur on the 
+Macintosh platform.
+The calendar can be modified to work for any location in the world by 
+changing which weekday is displayed as the first column, changing the month
+names, and changing the column headers for each day.
+
+USAGE:
+// Create a new CalendarPopup object of type WINDOW
+var cal = new CalendarPopup(); 
+
+// Create a new CalendarPopup object of type DIV using the DIV named 'mydiv'
+var cal = new CalendarPopup('mydiv'); 
+
+// Easy method to link the popup calendar with an input box. 
+cal.select(inputObject, anchorname, dateFormat);
+// Same method, but passing a default date other than the field's current value
+cal.select(inputObject, anchorname, dateFormat, '01/02/2000');
+// This is an example call to the popup calendar from a link to populate an 
+// input box. Note that to use this, date.js must also be included!!
+<A HREF="#" onClick="cal.select(document.forms[0].date,'anchorname','MM/dd/yyyy'); return false;">Select</A>
+
+// Set the type of date select to be used. By default it is 'date'.
+cal.setDisplayType(type);
+
+// When a date, month, quarter, or year is clicked, a function is called and
+// passed the details. You must write this function, and tell the calendar
+// popup what the function name is.
+// Function to be called for 'date' select receives y, m, d
+cal.setReturnFunction(functionname);
+// Function to be called for 'month' select receives y, m
+cal.setReturnMonthFunction(functionname);
+// Function to be called for 'quarter' select receives y, q
+cal.setReturnQuarterFunction(functionname);
+// Function to be called for 'year' select receives y
+cal.setReturnYearFunction(functionname);
+
+// Show the calendar relative to a given anchor
+cal.showCalendar(anchorname);
+
+// Hide the calendar. The calendar is set to autoHide automatically
+cal.hideCalendar();
+
+// Set the month names to be used. Default are English month names
+cal.setMonthNames("January","February","March",...);
+
+// Set the month abbreviations to be used. Default are English month abbreviations
+cal.setMonthAbbreviations("Jan","Feb","Mar",...);
+
+// Show navigation for changing by the year, not just one month at a time
+cal.showYearNavigation();
+
+// Show month and year dropdowns, for quicker selection of month of dates
+cal.showNavigationDropdowns();
+
+// Set the text to be used above each day column. The days start with 
+// sunday regardless of the value of WeekStartDay
+cal.setDayHeaders("S","M","T",...);
+
+// Set the day for the first column in the calendar grid. By default this
+// is Sunday (0) but it may be changed to fit the conventions of other
+// countries.
+cal.setWeekStartDay(1); // week is Monday - Sunday
+
+// Set the weekdays which should be disabled in the 'date' select popup. You can
+// then allow someone to only select week end dates, or Tuedays, for example
+cal.setDisabledWeekDays(0,1); // To disable selecting the 1st or 2nd days of the week
+
+// Selectively disable individual days or date ranges. Disabled days will not
+// be clickable, and show as strike-through text on current browsers.
+// Date format is any format recognized by parseDate() in date.js
+// Pass a single date to disable:
+cal.addDisabledDates("2003-01-01");
+// Pass null as the first parameter to mean "anything up to and including" the
+// passed date:
+cal.addDisabledDates(null, "01/02/03");
+// Pass null as the second parameter to mean "including the passed date and
+// anything after it:
+cal.addDisabledDates("Jan 01, 2003", null);
+// Pass two dates to disable all dates inbetween and including the two
+cal.addDisabledDates("January 01, 2003", "Dec 31, 2003");
+
+// When the 'year' select is displayed, set the number of years back from the 
+// current year to start listing years. Default is 2.
+// This is also used for year drop-down, to decide how many years +/- to display
+cal.setYearSelectStartOffset(2);
+
+// Text for the word "Today" appearing on the calendar
+cal.setTodayText("Today");
+
+// The calendar uses CSS classes for formatting. If you want your calendar to
+// have unique styles, you can set the prefix that will be added to all the
+// classes in the output.
+// For example, normal output may have this:
+//     <SPAN CLASS="cpTodayTextDisabled">Today<SPAN>
+// But if you set the prefix like this:
+cal.setCssPrefix("Test");
+// The output will then look like:
+//     <SPAN CLASS="TestcpTodayTextDisabled">Today<SPAN>
+// And you can define that style somewhere in your page.
+
+// When using Year navigation, you can make the year be an input box, so
+// the user can manually change it and jump to any year
+cal.showYearNavigationInput();
+
+// Set the calendar offset to be different than the default. By default it
+// will appear just below and to the right of the anchorname. So if you have
+// a text box where the date will go and and anchor immediately after the
+// text box, the calendar will display immediately under the text box.
+cal.offsetX = 20;
+cal.offsetY = 20;
+
+NOTES:
+1) Requires the functions in AnchorPosition.js and PopupWindow.js
+
+2) Your anchor tag MUST contain both NAME and ID attributes which are the 
+   same. For example:
+   <A NAME="test" ID="test"> </A>
+
+3) There must be at least a space between <A> </A> for IE5.5 to see the 
+   anchor tag correctly. Do not do <A></A> with no space.
+
+4) When a CalendarPopup object is created, a handler for 'onmouseup' is
+   attached to any event handler you may have already defined. Do NOT define
+   an event handler for 'onmouseup' after you define a CalendarPopup object 
+   or the autoHide() will not work correctly.
+   
+5) The calendar popup display uses style sheets to make it look nice.
+
+*/ 
+
+// Quick fix for FF3
+function CP_stop(e) { if (e && e.stopPropagation) { e.stopPropagation(); } }
+
+// CONSTRUCTOR for the CalendarPopup Object
+function CalendarPopup() {
+	var c;
+	if (arguments.length>0) {
+		c = new PopupWindow(arguments[0]);
+		}
+	else {
+		c = new PopupWindow();
+		c.setSize(150,175);
+		}
+	c.offsetX = -152;
+	c.offsetY = 25;
+	c.autoHide();
+	// Calendar-specific properties
+	c.monthNames = new Array("January","February","March","April","May","June","July","August","September","October","November","December");
+	c.monthAbbreviations = new Array("Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec");
+	c.dayHeaders = new Array("S","M","T","W","T","F","S");
+	c.returnFunction = "CP_tmpReturnFunction";
+	c.returnMonthFunction = "CP_tmpReturnMonthFunction";
+	c.returnQuarterFunction = "CP_tmpReturnQuarterFunction";
+	c.returnYearFunction = "CP_tmpReturnYearFunction";
+	c.weekStartDay = 0;
+	c.isShowYearNavigation = false;
+	c.displayType = "date";
+	c.disabledWeekDays = new Object();
+	c.disabledDatesExpression = "";
+	c.yearSelectStartOffset = 2;
+	c.currentDate = null;
+	c.todayText="Today";
+	c.cssPrefix="";
+	c.isShowNavigationDropdowns=false;
+	c.isShowYearNavigationInput=false;
+	window.CP_calendarObject = null;
+	window.CP_targetInput = null;
+	window.CP_dateFormat = "MM/dd/yyyy";
+	// Method mappings
+	c.copyMonthNamesToWindow = CP_copyMonthNamesToWindow;
+	c.setReturnFunction = CP_setReturnFunction;
+	c.setReturnMonthFunction = CP_setReturnMonthFunction;
+	c.setReturnQuarterFunction = CP_setReturnQuarterFunction;
+	c.setReturnYearFunction = CP_setReturnYearFunction;
+	c.setMonthNames = CP_setMonthNames;
+	c.setMonthAbbreviations = CP_setMonthAbbreviations;
+	c.setDayHeaders = CP_setDayHeaders;
+	c.setWeekStartDay = CP_setWeekStartDay;
+	c.setDisplayType = CP_setDisplayType;
+	c.setDisabledWeekDays = CP_setDisabledWeekDays;
+	c.addDisabledDates = CP_addDisabledDates;
+	c.setYearSelectStartOffset = CP_setYearSelectStartOffset;
+	c.setTodayText = CP_setTodayText;
+	c.showYearNavigation = CP_showYearNavigation;
+	c.showCalendar = CP_showCalendar;
+	c.hideCalendar = CP_hideCalendar;
+	c.getStyles = getCalendarStyles;
+	c.refreshCalendar = CP_refreshCalendar;
+	c.getCalendar = CP_getCalendar;
+	c.select = CP_select;
+	c.setCssPrefix = CP_setCssPrefix;
+	c.showNavigationDropdowns = CP_showNavigationDropdowns;
+	c.showYearNavigationInput = CP_showYearNavigationInput;
+	c.copyMonthNamesToWindow();
+	// Return the object
+	return c;
+	}
+function CP_copyMonthNamesToWindow() {
+	// Copy these values over to the date.js 
+	if (typeof(window.MONTH_NAMES)!="undefined" && window.MONTH_NAMES!=null) {
+		window.MONTH_NAMES = new Array();
+		for (var i=0; i<this.monthNames.length; i++) {
+			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthNames[i];
+		}
+		for (var i=0; i<this.monthAbbreviations.length; i++) {
+			window.MONTH_NAMES[window.MONTH_NAMES.length] = this.monthAbbreviations[i];
+		}
+	}
+}
+// Temporary default functions to be called when items clicked, so no error is thrown
+function CP_tmpReturnFunction(y,m,d) { 
+	if (window.CP_targetInput!=null) {
+		var dt = new Date(y,m-1,d,0,0,0);
+		if (window.CP_calendarObject!=null) { window.CP_calendarObject.copyMonthNamesToWindow(); }
+		window.CP_targetInput.value = formatDate(dt,window.CP_dateFormat);
+		}
+	else {
+		alert('Use setReturnFunction() to define which function will get the clicked results!'); 
+		}
+	}
+function CP_tmpReturnMonthFunction(y,m) { 
+	alert('Use setReturnMonthFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , month='+m); 
+	}
+function CP_tmpReturnQuarterFunction(y,q) { 
+	alert('Use setReturnQuarterFunction() to define which function will get the clicked results!\nYou clicked: year='+y+' , quarter='+q); 
+	}
+function CP_tmpReturnYearFunction(y) { 
+	alert('Use setReturnYearFunction() to define which function will get the clicked results!\nYou clicked: year='+y); 
+	}
+
+// Set the name of the functions to call to get the clicked item
+function CP_setReturnFunction(name) { this.returnFunction = name; }
+function CP_setReturnMonthFunction(name) { this.returnMonthFunction = name; }
+function CP_setReturnQuarterFunction(name) { this.returnQuarterFunction = name; }
+function CP_setReturnYearFunction(name) { this.returnYearFunction = name; }
+
+// Over-ride the built-in month names
+function CP_setMonthNames() {
+	for (var i=0; i<arguments.length; i++) { this.monthNames[i] = arguments[i]; }
+	this.copyMonthNamesToWindow();
+	}
+
+// Over-ride the built-in month abbreviations
+function CP_setMonthAbbreviations() {
+	for (var i=0; i<arguments.length; i++) { this.monthAbbreviations[i] = arguments[i]; }
+	this.copyMonthNamesToWindow();
+	}
+
+// Over-ride the built-in column headers for each day
+function CP_setDayHeaders() {
+	for (var i=0; i<arguments.length; i++) { this.dayHeaders[i] = arguments[i]; }
+	}
+
+// Set the day of the week (0-7) that the calendar display starts on
+// This is for countries other than the US whose calendar displays start on Monday(1), for example
+function CP_setWeekStartDay(day) { this.weekStartDay = day; }
+
+// Show next/last year navigation links
+function CP_showYearNavigation() { this.isShowYearNavigation = (arguments.length>0)?arguments[0]:true; }
+
+// Which type of calendar to display
+function CP_setDisplayType(type) {
+	if (type!="date"&&type!="week-end"&&type!="month"&&type!="quarter"&&type!="year") { alert("Invalid display type! Must be one of: date,week-end,month,quarter,year"); return false; }
+	this.displayType=type;
+	}
+
+// How many years back to start by default for year display
+function CP_setYearSelectStartOffset(num) { this.yearSelectStartOffset=num; }
+
+// Set which weekdays should not be clickable
+function CP_setDisabledWeekDays() {
+	this.disabledWeekDays = new Object();
+	for (var i=0; i<arguments.length; i++) { this.disabledWeekDays[arguments[i]] = true; }
+	}
+	
+// Disable individual dates or ranges
+// Builds an internal logical test which is run via eval() for efficiency
+function CP_addDisabledDates(start, end) {
+	if (arguments.length==1) { end=start; }
+	if (start==null && end==null) { return; }
+	if (this.disabledDatesExpression!="") { this.disabledDatesExpression+= "||"; }
+	if (start!=null) { start = parseDate(start); start=""+start.getFullYear()+LZ(start.getMonth()+1)+LZ(start.getDate());}
+	if (end!=null) { end=parseDate(end); end=""+end.getFullYear()+LZ(end.getMonth()+1)+LZ(end.getDate());}
+	if (start==null) { this.disabledDatesExpression+="(ds<="+end+")"; }
+	else if (end  ==null) { this.disabledDatesExpression+="(ds>="+start+")"; }
+	else { this.disabledDatesExpression+="(ds>="+start+"&&ds<="+end+")"; }
+	}
+	
+// Set the text to use for the "Today" link
+function CP_setTodayText(text) {
+	this.todayText = text;
+	}
+
+// Set the prefix to be added to all CSS classes when writing output
+function CP_setCssPrefix(val) { 
+	this.cssPrefix = val; 
+	}
+
+// Show the navigation as an dropdowns that can be manually changed
+function CP_showNavigationDropdowns() { this.isShowNavigationDropdowns = (arguments.length>0)?arguments[0]:true; }
+
+// Show the year navigation as an input box that can be manually changed
+function CP_showYearNavigationInput() { this.isShowYearNavigationInput = (arguments.length>0)?arguments[0]:true; }
+
+// Hide a calendar object
+function CP_hideCalendar() {
+	if (arguments.length > 0) { window.popupWindowObjects[arguments[0]].hidePopup(); }
+	else { this.hidePopup(); }
+	}
+
+// Refresh the contents of the calendar display
+function CP_refreshCalendar(index) {
+	var calObject = window.popupWindowObjects[index];
+	if (arguments.length>1) { 
+		calObject.populate(calObject.getCalendar(arguments[1],arguments[2],arguments[3],arguments[4],arguments[5]));
+		}
+	else {
+		calObject.populate(calObject.getCalendar());
+		}
+	calObject.refresh();
+	}
+
+// Populate the calendar and display it
+function CP_showCalendar(anchorname) {
+	if (arguments.length>1) {
+		if (arguments[1]==null||arguments[1]=="") {
+			this.currentDate=new Date();
+			}
+		else {
+			this.currentDate=new Date(parseDate(arguments[1]));
+			}
+		}
+	this.populate(this.getCalendar());
+	this.showPopup(anchorname);
+	}
+
+// Simple method to interface popup calendar with a text-entry box
+function CP_select(inputobj, linkname, format) {
+	var selectedDate=(arguments.length>3)?arguments[3]:null;
+	if (!window.getDateFromFormat) {
+		alert("calendar.select: To use this method you must also include 'date.js' for date formatting");
+		return;
+		}
+	if (this.displayType!="date"&&this.displayType!="week-end") {
+		alert("calendar.select: This function can only be used with displayType 'date' or 'week-end'");
+		return;
+		}
+	if (inputobj.type!="text" && inputobj.type!="hidden" && inputobj.type!="textarea") { 
+		alert("calendar.select: Input object passed is not a valid form input object"); 
+		window.CP_targetInput=null;
+		return;
+		}
+	if (inputobj.disabled) { return; } // Can't use calendar input on disabled form input!
+	window.CP_targetInput = inputobj;
+	window.CP_calendarObject = this;
+	this.currentDate=null;
+	var time=0;
+	if (selectedDate!=null) {
+		time = getDateFromFormat(selectedDate,format)
+		}
+	else if (inputobj.value!="") {
+		time = getDateFromFormat(inputobj.value,format);
+		}
+	if (selectedDate!=null || inputobj.value!="") {
+		if (time==0) { this.currentDate=null; }
+		else { this.currentDate=new Date(time); }
+		}
+	window.CP_dateFormat = format;
+	this.showCalendar(linkname);
+	}
+	
+// Get style block needed to display the calendar correctly
+function getCalendarStyles() {
+	var result = "";
+	var p = "";
+	if (this!=null && typeof(this.cssPrefix)!="undefined" && this.cssPrefix!=null && this.cssPrefix!="") { p=this.cssPrefix; }
+	result += "<STYLE>\n";
+	result += "."+p+"cpYearNavigation,."+p+"cpMonthNavigation { background-color:#C0C0C0; text-align:center; vertical-align:center; text-decoration:none; color:#000000; font-weight:bold; }\n";
+	result += "."+p+"cpDayColumnHeader, ."+p+"cpYearNavigation,."+p+"cpMonthNavigation,."+p+"cpCurrentMonthDate,."+p+"cpCurrentMonthDateDisabled,."+p+"cpOtherMonthDate,."+p+"cpOtherMonthDateDisabled,."+p+"cpCurrentDate,."+p+"cpCurrentDateDisabled,."+p+"cpTodayText,."+p+"cpTodayTextDisabled,."+p+"cpText { font-family:arial; font-size:8pt; }\n";
+	result += "TD."+p+"cpDayColumnHeader { text-align:right; border:solid thin #C0C0C0;border-width:0px 0px 1px 0px; }\n";
+	result += "."+p+"cpCurrentMonthDate, ."+p+"cpOtherMonthDate, ."+p+"cpCurrentDate  { text-align:right; text-decoration:none; }\n";
+	result += "."+p+"cpCurrentMonthDateDisabled, ."+p+"cpOtherMonthDateDisabled, ."+p+"cpCurrentDateDisabled { color:#D0D0D0; text-align:right; text-decoration:line-through; }\n";
+	result += "."+p+"cpCurrentMonthDate, .cpCurrentDate { color:#000000; }\n";
+	result += "."+p+"cpOtherMonthDate { color:#808080; }\n";
+	result += "TD."+p+"cpCurrentDate { color:white; background-color: #C0C0C0; border-width:1px; border:solid thin #800000; }\n";
+	result += "TD."+p+"cpCurrentDateDisabled { border-width:1px; border:solid thin #FFAAAA; }\n";
+	result += "TD."+p+"cpTodayText, TD."+p+"cpTodayTextDisabled { border:solid thin #C0C0C0; border-width:1px 0px 0px 0px;}\n";
+	result += "A."+p+"cpTodayText, SPAN."+p+"cpTodayTextDisabled { height:20px; }\n";
+	result += "A."+p+"cpTodayText { color:black; }\n";
+	result += "."+p+"cpTodayTextDisabled { color:#D0D0D0; }\n";
+	result += "."+p+"cpBorder { border:solid thin #808080; }\n";
+	result += "</STYLE>\n";
+	return result;
+	}
+
+// Return a string containing all the calendar code to be displayed
+function CP_getCalendar() {
+	var now = new Date();
+	// Reference to window
+	if (this.type == "WINDOW") { var windowref = "window.opener."; }
+	else { var windowref = ""; }
+	var result = "";
+	// If POPUP, write entire HTML document
+	if (this.type == "WINDOW") {
+		result += "<HTML><HEAD><TITLE>Calendar</TITLE>"+this.getStyles()+"</HEAD><BODY MARGINWIDTH=0 MARGINHEIGHT=0 TOPMARGIN=0 RIGHTMARGIN=0 LEFTMARGIN=0>\n";
+		result += '<CENTER><TABLE WIDTH=100% BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>\n';
+		}
+	else {
+		result += '<TABLE CLASS="'+this.cssPrefix+'cpBorder" WIDTH=144 BORDER=1 BORDERWIDTH=1 CELLSPACING=0 CELLPADDING=1>\n';
+		result += '<TR><TD ALIGN=CENTER>\n';
+		result += '<CENTER>\n';
+		}
+	// Code for DATE display (default)
+	// -------------------------------
+	if (this.displayType=="date" || this.displayType=="week-end") {
+		if (this.currentDate==null) { this.currentDate = now; }
+		if (arguments.length > 0) { var month = arguments[0]; }
+			else { var month = this.currentDate.getMonth()+1; }
+		if (arguments.length > 1 && arguments[1]>0 && arguments[1]-0==arguments[1]) { var year = arguments[1]; }
+			else { var year = this.currentDate.getFullYear(); }
+		var daysinmonth= new Array(0,31,28,31,30,31,30,31,31,30,31,30,31);
+		if ( ( (year%4 == 0)&&(year%100 != 0) ) || (year%400 == 0) ) {
+			daysinmonth[2] = 29;
+			}
+		var current_month = new Date(year,month-1,1);
+		var display_year = year;
+		var display_month = month;
+		var display_date = 1;
+		var weekday= current_month.getDay();
+		var offset = 0;
+		
+		offset = (weekday >= this.weekStartDay) ? weekday-this.weekStartDay : 7-this.weekStartDay+weekday ;
+		if (offset > 0) {
+			display_month--;
+			if (display_month < 1) { display_month = 12; display_year--; }
+			display_date = daysinmonth[display_month]-offset+1;
+			}
+		var next_month = month+1;
+		var next_month_year = year;
+		if (next_month > 12) { next_month=1; next_month_year++; }
+		var last_month = month-1;
+		var last_month_year = year;
+		if (last_month < 1) { last_month=12; last_month_year--; }
+		var date_class;
+		if (this.type!="WINDOW") {
+			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+			}
+		result += '<TR>\n';
+		var refresh = windowref+'CP_refreshCalendar';
+		var refreshLink = 'javascript:' + refresh;
+		if (this.isShowNavigationDropdowns) {
+			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="78" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpMonthNavigation" name="cpMonth" onmouseup="CP_stop(event)" onChange="'+refresh+'('+this.index+',this.options[this.selectedIndex].value-0,'+(year-0)+');">';
+			for( var monthCounter=1; monthCounter<=12; monthCounter++ ) {
+				var selected = (monthCounter==month) ? 'SELECTED' : '';
+				result += '<option value="'+monthCounter+'" '+selected+'>'+this.monthNames[monthCounter-1]+'</option>';
+				}
+			result += '</select></TD>';
+			result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
+
+			result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="56" COLSPAN="3"><select CLASS="'+this.cssPrefix+'cpYearNavigation" name="cpYear" onmouseup="CP_stop(event)" onChange="'+refresh+'('+this.index+','+month+',this.options[this.selectedIndex].value-0);">';
+			for( var yearCounter=year-this.yearSelectStartOffset; yearCounter<=year+this.yearSelectStartOffset; yearCounter++ ) {
+				var selected = (yearCounter==year) ? 'SELECTED' : '';
+				result += '<option value="'+yearCounter+'" '+selected+'>'+yearCounter+'</option>';
+				}
+			result += '</select></TD>';
+			}
+		else {
+			if (this.isShowYearNavigation) {
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;</A></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="58"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+'</SPAN></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;</A></TD>';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="10">&nbsp;</TD>';
+
+				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year-1)+');">&lt;</A></TD>';
+				if (this.isShowYearNavigationInput) {
+					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><INPUT NAME="cpYear" CLASS="'+this.cssPrefix+'cpYearNavigation" SIZE="4" MAXLENGTH="4" VALUE="'+year+'" onBlur="'+refresh+'('+this.index+','+month+',this.value-0);"></TD>';
+					}
+				else {
+					result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="36"><SPAN CLASS="'+this.cssPrefix+'cpYearNavigation">'+year+'</SPAN></TD>';
+					}
+				result += '<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="10"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="'+refreshLink+'('+this.index+','+month+','+(year+1)+');">&gt;</A></TD>';
+				}
+			else {
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+last_month+','+last_month_year+');">&lt;&lt;</A></TD>\n';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="100"><SPAN CLASS="'+this.cssPrefix+'cpMonthNavigation">'+this.monthNames[month-1]+' '+year+'</SPAN></TD>\n';
+				result += '<TD CLASS="'+this.cssPrefix+'cpMonthNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpMonthNavigation" HREF="'+refreshLink+'('+this.index+','+next_month+','+next_month_year+');">&gt;&gt;</A></TD>\n';
+				}
+			}
+		result += '</TR></TABLE>\n';
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=0 CELLPADDING=1 ALIGN=CENTER>\n';
+		result += '<TR>\n';
+		for (var j=0; j<7; j++) {
+
+			result += '<TD CLASS="'+this.cssPrefix+'cpDayColumnHeader" WIDTH="14%"><SPAN CLASS="'+this.cssPrefix+'cpDayColumnHeader">'+this.dayHeaders[(this.weekStartDay+j)%7]+'</TD>\n';
+			}
+		result += '</TR>\n';
+		for (var row=1; row<=6; row++) {
+			result += '<TR>\n';
+			for (var col=1; col<=7; col++) {
+				var disabled=false;
+				if (this.disabledDatesExpression!="") {
+					var ds=""+display_year+LZ(display_month)+LZ(display_date);
+					eval("disabled=("+this.disabledDatesExpression+")");
+					}
+				var dateClass = "";
+				if ((display_month == this.currentDate.getMonth()+1) && (display_date==this.currentDate.getDate()) && (display_year==this.currentDate.getFullYear())) {
+					dateClass = "cpCurrentDate";
+					}
+				else if (display_month == month) {
+					dateClass = "cpCurrentMonthDate";
+					}
+				else {
+					dateClass = "cpOtherMonthDate";
+					}
+				if (disabled || this.disabledWeekDays[col-1]) {
+					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><SPAN CLASS="'+this.cssPrefix+dateClass+'Disabled">'+display_date+'</SPAN></TD>\n';
+					}
+				else {
+					var selected_date = display_date;
+					var selected_month = display_month;
+					var selected_year = display_year;
+					if (this.displayType=="week-end") {
+						var d = new Date(selected_year,selected_month-1,selected_date,0,0,0,0);
+						d.setDate(d.getDate() + (7-col));
+						selected_year = d.getYear();
+						if (selected_year < 1000) { selected_year += 1900; }
+						selected_month = d.getMonth()+1;
+						selected_date = d.getDate();
+						}
+					result += '	<TD CLASS="'+this.cssPrefix+dateClass+'"><A HREF="javascript:'+windowref+this.returnFunction+'('+selected_year+','+selected_month+','+selected_date+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+this.cssPrefix+dateClass+'">'+display_date+'</A></TD>\n';
+					}
+				display_date++;
+				if (display_date > daysinmonth[display_month]) {
+					display_date=1;
+					display_month++;
+					}
+				if (display_month > 12) {
+					display_month=1;
+					display_year++;
+					}
+				}
+			result += '</TR>';
+			}
+		var current_weekday = now.getDay() - this.weekStartDay;
+		if (current_weekday < 0) {
+			current_weekday += 7;
+			}
+		result += '<TR>\n';
+		result += '	<TD COLSPAN=7 ALIGN=CENTER CLASS="'+this.cssPrefix+'cpTodayText">\n';
+		if (this.disabledDatesExpression!="") {
+			var ds=""+now.getFullYear()+LZ(now.getMonth()+1)+LZ(now.getDate());
+			eval("disabled=("+this.disabledDatesExpression+")");
+			}
+		if (disabled || this.disabledWeekDays[current_weekday+1]) {
+			result += '		<SPAN CLASS="'+this.cssPrefix+'cpTodayTextDisabled">'+this.todayText+'</SPAN>\n';
+			}
+		else {
+			result += '		<A CLASS="'+this.cssPrefix+'cpTodayText" HREF="javascript:'+windowref+this.returnFunction+'(\''+now.getFullYear()+'\',\''+(now.getMonth()+1)+'\',\''+now.getDate()+'\');'+windowref+'CP_hideCalendar(\''+this.index+'\');">'+this.todayText+'</A>\n';
+			}
+		result += '		<BR>\n';
+		result += '	</TD></TR></TABLE></CENTER></TD></TR></TABLE>\n';
+	}
+
+	// Code common for MONTH, QUARTER, YEAR
+	// ------------------------------------
+	if (this.displayType=="month" || this.displayType=="quarter" || this.displayType=="year") {
+		if (arguments.length > 0) { var year = arguments[0]; }
+		else { 
+			if (this.displayType=="year") {	var year = now.getFullYear()-this.yearSelectStartOffset; }
+			else { var year = now.getFullYear(); }
+			}
+		if (this.displayType!="year" && this.isShowYearNavigation) {
+			result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+			result += '<TR>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-1)+');">&lt;&lt;</A></TD>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="100">'+year+'</TD>\n';
+			result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="22"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+1)+');">&gt;&gt;</A></TD>\n';
+			result += '</TR></TABLE>\n';
+			}
+		}
+		
+	// Code for MONTH display 
+	// ----------------------
+	if (this.displayType=="month") {
+		// If POPUP, write entire HTML document
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<4; i++) {
+			result += '<TR>';
+			for (var j=0; j<3; j++) {
+				var monthindex = ((i*3)+j);
+				result += '<TD WIDTH=33% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnMonthFunction+'('+year+','+(monthindex+1)+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+this.monthAbbreviations[monthindex]+'</A></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+	
+	// Code for QUARTER display
+	// ------------------------
+	if (this.displayType=="quarter") {
+		result += '<BR><TABLE WIDTH=120 BORDER=1 CELLSPACING=0 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<2; i++) {
+			result += '<TR>';
+			for (var j=0; j<2; j++) {
+				var quarter = ((i*2)+j+1);
+				result += '<TD WIDTH=50% ALIGN=CENTER><BR><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnQuarterFunction+'('+year+','+quarter+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">Q'+quarter+'</A><BR><BR></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+
+	// Code for YEAR display
+	// ---------------------
+	if (this.displayType=="year") {
+		var yearColumnSize = 4;
+		result += "<TABLE WIDTH=144 BORDER=0 BORDERWIDTH=0 CELLSPACING=0 CELLPADDING=0>";
+		result += '<TR>\n';
+		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year-(yearColumnSize*2))+');">&lt;&lt;</A></TD>\n';
+		result += '	<TD CLASS="'+this.cssPrefix+'cpYearNavigation" WIDTH="50%"><A CLASS="'+this.cssPrefix+'cpYearNavigation" HREF="javascript:'+windowref+'CP_refreshCalendar('+this.index+','+(year+(yearColumnSize*2))+');">&gt;&gt;</A></TD>\n';
+		result += '</TR></TABLE>\n';
+		result += '<TABLE WIDTH=120 BORDER=0 CELLSPACING=1 CELLPADDING=0 ALIGN=CENTER>\n';
+		for (var i=0; i<yearColumnSize; i++) {
+			for (var j=0; j<2; j++) {
+				var currentyear = year+(j*yearColumnSize)+i;
+				result += '<TD WIDTH=50% ALIGN=CENTER><A CLASS="'+this.cssPrefix+'cpText" HREF="javascript:'+windowref+this.returnYearFunction+'('+currentyear+');'+windowref+'CP_hideCalendar(\''+this.index+'\');" CLASS="'+date_class+'">'+currentyear+'</A></TD>';
+				}
+			result += '</TR>';
+			}
+		result += '</TABLE></CENTER></TD></TR></TABLE>\n';
+		}
+	// Common
+	if (this.type == "WINDOW") {
+		result += "</BODY></HTML>\n";
+		}
+	return result;
+	}
diff --git a/character-twitter.php b/character-twitter.php
new file mode 100644
index 0000000..ed255a0
--- /dev/null
+++ b/character-twitter.php
@@ -0,0 +1,122 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+#Actual logic. Only trigger if something submitted.
+if('post_twitter' == $_REQUEST['action'])
+{
+	check_nonce('new-character-twitter');
+	
+	#Fetch the password from the DB.
+	$acct = $mtdb->getRow(sprintf("SELECT username, password FROM twitter_user WHERE id = '%d'", $_REQUEST['twitter-account']));
+	
+	$post_at = strtotime($_REQUEST['date18']);
+	
+	if($post_at)
+	{
+		if($post_at <= strtotime('now'))
+		{
+			#If we can post immediately, do so. Bypass the scheduler whenever possible.
+			#Treat a date/time in the past as immediate.
+			$ret = twitterpost($_REQUEST['message'], $acct->username, $acct->password);
+			
+			if($ret)
+			{
+				$info.='Update posted to Twitter. <a href="http://www.twitter.com/'.$acct->username.'">View Twitter</a>.';
+				adminlog('New manual post to Twitter for user '. $acct->username .'.', MTS_TWITTER, MTA_ADD);
+			}
+			else
+			{
+				$error.='There was an error posting to Twitter.';
+			}
+		}
+		else
+		{
+			#No luck, gotta schedule.
+			$mtdb->query(
+				sprintf("INSERT INTO twitter_post (status, user, time, text)VALUES ('scheduled', '%d', FROM_UNIXTIME('%d'), '%s')",
+					mysql_real_escape_string($_REQUEST['twitter-account']),
+					$post_at,
+					mysql_real_escape_string($_REQUEST['message'])
+				)
+			);
+			$info .= "Your tweet for user " . htmlentities($acct->username) . " has been scheduled.";
+			adminlog('Tweet for account ' . $acct->username . ' has been scheduled.', MTS_TWITTER, MTA_ADD);
+		}
+	}
+	else
+	{
+		$error .= 'Could not make sense of your designated time/date. Please try again.';
+	}
+}
+
+$characters = $mtdb->getAll("SELECT id, username FROM twitter_user ORDER BY username");
+
+$scheduled = $mtdb->getAll("SELECT username, text, status, twitter_post.id AS id, time
+	FROM twitter_post JOIN twitter_user
+		ON twitter_post.user = twitter_user.id
+	WHERE twitter_post.status = 'scheduled' ORDER BY time");
+
+adminhead('Manage Character Twitters');
+adminmenu();
+?>
+
+<h2>Manage Character Twitters</h2>
+<form method="post" action="character-twitter.php">
+<?php nonce_field('new-character-twitter'); ?>
+<input type="hidden" name="action" value="post_twitter" />
+<p><select name="twitter-account">
+<option value="">Select twitter</option>
+<?php foreach($characters as $c) {
+	printf( '<option value="%s">%s</option>', htmlentities($c->id), htmlentities($c->username) );
+} ?>
+</select></p>
+<p style="padding-bottom:1em;">
+	<input type="text" name="message" maxlength="140" size="70" />
+At: <script type="text/javascript" src="CalendarPopup.js" ></script>
+	<script type="text/javascript">
+		var cal18 = new CalendarPopup("testdiv1");
+		cal18.setCssPrefix("TEST");
+	</script>
+	<INPUT TYPE="text" NAME="date18" VALUE="now" SIZE=25>
+	<A HREF="#" onClick="cal18.select(document.forms[0].date18,'anchor18','yyyy/MM/dd'); return false;" TITLE="cal18.select(document.forms[0].date18,'anchor18','MM/dd/yyyy'); return false;" NAME="anchor18" ID="anchor18">select</A>
+	<DIV ID="testdiv1" STYLE="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></DIV>
+	<input type="submit" value="Send" />
+</p>
+</form>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col">User</th>
+	<th scope="col">Tweet</th>
+	<th scope="col">Time</th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $scheduled as $s ) {
+		$alternate=!$alternate;
+		?>
+		<tr <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <td><?php echo $s->username;	 ?></td>
+		 <td><?php echo $s->text; ?></td>
+		 <td><?php echo htmlentities($s->time); ?></td>
+		 <td style="text-align: center;"><a class="delete" href="delete-tweet.php?tweet_id=<?php echo $s->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+<script type="text/javascript" src="<?php echo SITE_HOST.SITE_PATH; ?>/resources.js"></script>
+
+<?php
+adminfooter();
+?>
\ No newline at end of file
diff --git a/delete-comic.php b/delete-comic.php
new file mode 100644
index 0000000..ad20caa
--- /dev/null
+++ b/delete-comic.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+// Deliberatly don't pass a nonce here, always AYS
+check_nonce('delete-strip-'.(int)$_REQUEST['strip_id']);
+
+if(!deletestrip( $_REQUEST['strip_id'] ))
+{
+	adminlog("Error deleting strip $_REQUEST[strip_id]:".mysql_error(), MTS_STRIP, MTA_DELETE, E_ERROR);
+	mtdie('Error deleting the specified strip.','SQL Error');
+}
+
+adminlog("Strip $_REQUEST[strip_id] deleted.", MTS_STRIP, MTA_DELETE);
+_redirect( ADMIN_PATH . '/manage-comics.php?deleted=success' );
+
+?>
\ No newline at end of file
diff --git a/delete-page.php b/delete-page.php
new file mode 100644
index 0000000..14bbf01
--- /dev/null
+++ b/delete-page.php
@@ -0,0 +1,19 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+// Deliberatly don't pass a nonce here, always AYS
+check_nonce('delete-page-'.$_REQUEST['page_name']);
+
+if(!deletepage( $_REQUEST['page_name'] ))
+{
+	adminlog("Error deleting page $_REQUEST[page_name]: ".mysql_error(), MTS_PAGE, MTA_DELETE, E_ERROR);
+	mtdie('Error deleting the specified page.','SQL Error');
+}
+
+adminlog("Page $_REQUEST[page_name] deleted.", MTS_PAGE, MTA_DELETE);
+_redirect( ADMIN_PATH . '/manage-pages.php?deleted=success' );
+
+?>
diff --git a/delete-rant.php b/delete-rant.php
new file mode 100644
index 0000000..9fdee71
--- /dev/null
+++ b/delete-rant.php
@@ -0,0 +1,17 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+// Deliberatly don't pass a nonce here, always AYS
+check_nonce('delete-rant-'.(int)$_REQUEST['rant_id']);
+
+if(!deleterant( $_REQUEST['rant_id'] ))
+{
+	adminlog("Error deleting rant $_REQUEST[rant_id]: ".mysql_error(), MTS_RANT, MTA_DELETE, E_ERROR);
+	mtdie('Error deleting the specified rant.','SQL Error');
+}
+
+_redirect( ADMIN_PATH . '/manage-rants.php?deleted=success' );
+?>
\ No newline at end of file
diff --git a/delete-tweet.php b/delete-tweet.php
new file mode 100644
index 0000000..399e6ea
--- /dev/null
+++ b/delete-tweet.php
@@ -0,0 +1,26 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+// Deliberatly don't pass a nonce here, always AYS
+check_nonce('delete-tweet-'.(int)$_REQUEST['tweet_id']);
+
+//Filter input first
+$victim = (int)$_REQUEST['tweet_id'];
+
+if($victim)
+{
+	$r = $mtdb->query("DELETE FROM twitter_post WHERE id = '$victim'");
+	if(!$r)
+	{
+		adminlog('Error deleting scheduled tweet ' . $victim, MTS_TWITTER, MTA_DELETE, E_ERROR);
+		mtdie('Error deleting the specified tweet.', 'SQL Error');
+	}
+}
+
+adminlog("Tweet $victim deleted.", MTS_TWITTER, MTA_DELETE);
+_redirect( ADMIN_PATH . '/character-twitter.php?deleted=success' );
+
+?>
\ No newline at end of file
diff --git a/delete-twitter-user.php b/delete-twitter-user.php
new file mode 100644
index 0000000..8609ecf
--- /dev/null
+++ b/delete-twitter-user.php
@@ -0,0 +1,26 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+// Deliberatly don't pass a nonce here, always AYS
+check_nonce('delete-twitteruser-'.(int)$_REQUEST['id']);
+
+//Filter input first
+$victim = (int)$_REQUEST['id'];
+
+if($victim)
+{
+	$r = $mtdb->query("DELETE FROM twitter_user WHERE id = '$victim'");
+	if(!$r)
+	{
+		adminlog('Error deleting specified twitter user ' . $victim, MTS_TWITTER, MTA_DELETE, E_ERROR);
+		mtdie('Error deleting the specified twitter user.', 'SQL Error');
+	}
+}
+
+adminlog("Twitter $victim deleted.", MTS_TWITTER, MTA_DELETE);
+_redirect( ADMIN_PATH . '/manage-twitter-users.php?deleted=success' );
+
+?>
\ No newline at end of file
diff --git a/edit-comic.php b/edit-comic.php
new file mode 100644
index 0000000..6d526fe
--- /dev/null
+++ b/edit-comic.php
@@ -0,0 +1,258 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$strip = new Strip();
+$strip->id = (int)$_REQUEST['strip_id'];
+$strip = getstrip($strip->id);
+
+if( $_POST ) {
+	
+	// Form Elements
+	$strip->new_id = (int)$_POST['strip_new_id'] ? (int)$_POST['strip_new_id'] : $strip->id;
+	$strip->published = empty($_POST['strip_date']) ? time() : strtotime( $_POST['strip_date'] );
+	$strip->type = (int)$_POST['strip_type'];
+	$strip->title = trim($_POST['strip_title']);
+	$strip->transcript_posted = $_POST['content'];
+	$strip->book = trim($_POST['book']);
+	$strip->page = trim($_POST['page']);
+	
+	if( '' == $strip->title ) mtdie('Strips must be supplied with titles.');
+
+	$YESTERDAY = mktime(0,0,0, date('m'), date('d')-1, date('Y'));
+
+	switch($_POST['action']) {
+		case 'new_comic':
+
+			check_nonce('new-strip');
+
+			// Ensure that dates are not in the past
+			if( $strip->published < $YESTERDAY )
+				mtdie('Strips may not be backdated. Enter a date today or in the future.');
+
+			if( !is_valid_upload('comicFile') )
+			{
+				adminlog("Image upload failed.", MTS_STRIP, MTA_ADD, E_WARNING);
+				mtdie('If you want to upload a new comic, you must provide said comic.','Strip upload failed.');
+			}
+			
+			// get image type and target extension
+			$imagedata = getimagesize($_FILES['comicFile']['tmp_name']);
+			$strip->media = $imagedata[2];
+			$fileext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id = ' . (int)$strip->media );
+			
+			if(strlen($fileext) < 3)
+			{
+				//bad image upload type
+				adminlog("Bad image type upload on new strip. Invalid media type.", MTS_STRIP, MTA_ADD, E_ERROR);
+				mtdie('Bad image type upload on new strip. Invalid media type.');
+			}
+			
+			// Insert new strip into the database, get a real $strip->id
+			if(!insertstrip( $strip ))
+			{
+				adminlog("Error on insertion of new strip: ".mysql_error(), MTS_STRIP, MTA_ADD, E_ERROR);
+				mtdie('Error on insertion of new strip: '.mysql_error(), 'SQL Error');
+			}
+			
+			// Store the uploaded file to xxxx-0.ext
+			$basefile = $strip->published <= time() ?
+			            sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/'.'%04d.%s', $strip->id, $fileext) :
+				    sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/restricted/'.'%04d.%s', $strip->id, $fileext);
+			if(!move_uploaded_file($_FILES['comicFile']['tmp_name'], $basefile))
+			{
+				adminlog("Filesystem error in storing image.", MTS_STRIP, MTA_ADD, E_ERROR);
+				mtdie('There was a problem storing the uploaded strip image. Please <s>harass</s> contact support.','Filesystem Error');
+			}
+
+			// Alert Twitter if the strip is for immediate publication
+			if( $strip->published <= time() )
+				twitterpost("Comic ".$strip->id." posted: ".SITE_HOST.SITE_PATH."/strip/".$strip->id);
+
+			$info.="<p>Comic posted!</p>";
+			break;
+					
+		case 'edit_comic':
+			if( 0 >= $strip->new_id ) mtdie('Strip numbers must be numeric, greater than 0.');
+			if( 0 >= $strip->id ) mtdie('Existing strip number, in the form, was zero. This should never happen.');
+			
+			// When updating, $strip->id is the old strip number. Update in place first. Possibly adjust strip number later.
+			check_nonce('save-strip-'.$strip->id);
+
+			// If uploading, get filetype. If not uploading, filetype got loaded from database earlier.
+			if( is_valid_upload('comicFile') ) {
+				$imagedata = getimagesize($_FILES['comicFile']['tmp_name']);
+				$strip->media = $imagedata[2];
+			}
+			$fileext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id=' . (int)$strip->media );
+			
+			if(strlen($fileext) < 3)
+			{
+				//bad image upload type
+				adminlog("Bad image type upload on strip ".$strip->id.". Invalid media type.", MTS_STRIP, MTA_UPDATE, E_ERROR);
+				mtdie('Bad image type upload on strip '.$strip->id.'. Invalid media type.');
+			}
+			
+			// Update existing strip
+			if(!updatestrip( $strip ) )
+			{
+				adminlog("Failed to update strip ".$strip->id.".", MTS_STRIP, MTA_UPDATE);
+				mtdie('Error updating strip: ' . mysql_error(), 'SQL Error');
+			}
+			
+			if( is_valid_upload('comicFile') ) {	// If uploading, store the uploaded file to xxxx-n.ext
+				$basefile = $strip->published <= time() ?
+					    sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/'.'%04d.%s', $strip->id, $fileext) :
+					    sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/restricted/'.'%04d.%s', $strip->id, $fileext);
+			
+				if(!move_uploaded_file($_FILES['comicFile']['tmp_name'], $basefile))
+				{
+					adminlog("Filesystem error in saving image.", MTS_STRIP, MTA_UPDATE, E_ERROR);
+					mtdie("There was a problem storing the uploaded strip image. Please <s>harass</s> contact support.", 'Filesystem Error');
+				}
+				adminlog("Image replaced for comic ".$strip->id.".", MTS_STRIP, MTA_UPDATE);
+			}
+			// No new file uploaded. Do nuffink.
+
+			// Conditionally broadcast success
+			if( $_POST['broadcast'] ) {
+				#Limit broadcast message to 60 characters. Compose it now.
+				$b_msg = 'Comic ' . $strip->id . ' updated: ' . substr(trim($_REQUEST['broadcast_message']), 0, 60) . ', ' . SITE_HOST . SITE_PATH . "/strip/" . $strip->id;
+				
+				rsspost($b_msg, SITE_HOST.SITE_PATH.'/strip/'.$strip->id);
+				twitterpost($b_msg);
+				$info.="<p>Update broadcasted with message '$b_msg'.</p>";
+			}
+
+			$info.="<p>Changes saved. <a href=\"".SITE_HOST.SITE_PATH."/index.php?strip_id=".$strip->id."\">View on site</a>.";
+			break;
+			
+		default:
+			adminlog("User did something strange.", MTS_STRIP, MTA_MODIFY);
+			mtdie('You know, it would be <em>really</em> nice if you avoided nonsensical actions.');
+	}
+	
+	$info = savetranscript($strip) . $info;
+
+	# If the strip number changed, swap strips sequentially to shuffle it into place
+	if( $strip->id != $strip->new_id ) {
+		$f = fopen(SITE_PATH_ABS.'/'.SITE_STRIP.'/'.SITE_STRIP_LOCK, 'w');
+		flock($f, LOCK_EX);
+	
+		while( $strip->new_id < $strip->id ) {	// Move this strip backward
+			swap_strips( $strip->id - 1, $strip->id );
+			$strip->id--;
+		}
+		while( $strip->id < $strip->new_id ) {	// Move this strip forward
+			swap_strips( $strip->id + 1, $strip->id );
+			$strip->id++;
+		}
+		$strip->id = $strip->new_id;
+		close($f);
+	}
+}
+
+////////////////////// Display Edit Form ////////////////////////
+$strip = getstrip($strip->id);
+gettranscript($strip);
+
+adminhead('Edit Comic');
+adminmenu('manage-comics.php');
+
+?>
+
+<h2>Edit Comic</h2>
+
+<form action="edit-comic.php" method="post" enctype="multipart/form-data" name="post" id="post">
+<?php nonce_field('save-strip-'.$strip->id); ?>
+<input type="hidden" name="action" value="edit_comic" />
+<input type="hidden" name="strip_id" size="40" tabindex="1" value="<?php echo $strip->id; ?>" />
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="slugdiv" class="dbx-box">
+<h3 class="dbx-handle">Comic Type</h3>
+<div class="dbx-content"><select name="strip_type">
+<?php
+$types = $mtdb->getAll( 'SELECT id, description FROM strip_t ORDER BY id' );
+foreach( $types as $k=>$v )
+	printf('<option value="%s" %s>%s</option>', htmlentities($v->id), ($strip->type == $v->id ? 'selected="selected"' : '' ), htmlentities($v->description));
+
+?>
+</select></div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Post Date</h3>
+<div class="dbx-content"> <input type="text" name="strip_date" value="<?php echo htmlentities( date( 'Y-m-d H:i:s', $strip->published )); ?>" /> </div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Strip Number</h3>
+<div class="dbx-content"> <input type="text" name="strip_new_id" size="6" value="<?php echo $strip->id; ?>" id="strip_id" /> </div>
+</fieldset>
+
+<fieldset id="stripdiv" class="dbx-box">
+<h3 class="dbx-handle">Replace Comic</h3>
+<div class="dbx-content"> <input type="hidden" name="MAX_FILE_SIZE" value="10000000" /><input name="comicFile" type="file" tabindex="2" size="12"/> </div>
+</fieldset>
+
+<fieldset id="broadcastdiv" class="dbx-box">
+<h3 class="dbx-handle">Broadcast Update</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="broadcast" value="0" checked="checked" />No</label>
+	<label><input type="radio" name="broadcast" value="1" />Yes</label>
+	<input type="text" name="broadcast_message" maxlength="60" size="15" />
+</div>
+</fieldset>
+
+<?php
+$file = get_stripimage_filename( $strip );
+if( file_exists( SITE_PATH_ABS.'/'.$file ) ){
+	?>
+		<fieldset id="pubdatediv" class="dbx-box">
+		<h3 class="dbx-handle">Strip</h3>
+		<div class="dbx-content"> <a target="_new" href="<?php echo SITE_HOST.SITE_PATH; ?>/index.php?strip_id=<?php echo $strip->id;
+			?>"><img src="<?php echo SITE_HOST.SITE_PATH.'/'.$file; ?>" width="170" /></a> </div>
+		</fieldset>
+	<?php
+}
+?>
+
+<fieldset id="bookpagenumberdiv" class="dbx-box">
+	<h3 class="dbx-handle">Book Page Number</h3>
+	<div class="dbx-content"> <input type="text" name="book" size="3" value="<?php echo $strip->book; ?>" />-<input type="text" name="page" size="4" value="<?php echo $strip->page; ?>" /></div>
+</fieldset>
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="strip_title" size="40" tabindex="1" value="<?php echo numeric_entities(utfentities($strip->title)) ?>" id="title" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Transcript</legend>
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="27" cols="40" name="content" tabindex="3" id="content"><?php	echo htmlentities($strip->transcript, ENT_COMPAT, 'UTF-8'); ?></textarea></div>
+</fieldset>
+
+<p class="submit">
+ <input name="edit_comic" type="submit" id="edit_comic" tabindex="4" accesskey="s" value="Save Changes" />
+</p>
+
+</div>
+</form>
+
+<?php
+adminfooter();
+?>
+
diff --git a/edit-metatype.php b/edit-metatype.php
new file mode 100644
index 0000000..67e65e6
--- /dev/null
+++ b/edit-metatype.php
@@ -0,0 +1,37 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$type = $mtdb->getRow( 'SELECT id, name FROM meta_t WHERE id=' . (int)$_GET['edit'] )
+	or mtdie("Invalid metatype number!");
+
+adminhead('Metatypes');
+adminmenu('manage-metatypes.php');
+
+?>
+
+<h2>Edit Metatype Information</h2>
+
+<form action="manage-metatypes.php" method="post" name="post" id="post">
+<?php nonce_field('save-metatype-'.$type->id); ?>
+<input type="hidden" name="action" value="edit_meta" />
+<input type="hidden" name="type_id" value="<?php echo $type->id; ?>" />
+
+<div id="poststuff">
+
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Name</th>
+	<td width="66%"><input name="name" type="text" id="name" value="<?php echo htmlentities($type->name); ?>" /></td>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Save &raquo;" name="submit" /></p>
+
+</div>
+
+</form>
+
+<?php adminfooter(); ?>
diff --git a/edit-page.php b/edit-page.php
new file mode 100644
index 0000000..617baa5
--- /dev/null
+++ b/edit-page.php
@@ -0,0 +1,158 @@
+<?php
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$page = new Page();
+$page->url_name = $_REQUEST['page_name'];
+$page = getpage($page->url_name);
+
+if( $_POST ) {
+	$page->url_name = $_POST['page_name'] ? $_POST['page_name'] : preg_replace('/\s+/', '_', strtolower(trim($_POST['title'])));
+	$page->status = $_POST['page_status'] == 'published' ? 'published' : 'draft';
+	$page->title = $_POST['title'];
+	$page->body = $_POST['content'];
+	$page->style = $_POST['style'];
+
+	if( USING_TIDY ) {
+		$tidy = new tidy;
+		$config = $tidy->getConfig();
+		$tidy->parseString( $page->body, $config, 'UTF8' );
+		$tidy->cleanRepair();
+		$page->body = tidy_get_output($tidy);
+	}
+
+	$action = isset($_POST['publish']) ? 'post' : 'edit';
+	
+	if( isset( $_POST['publish'] ) ) $page->status = 'published';	// If [publish] button is used, ignore radio button
+
+	
+	switch( $_POST['action'] ) {
+		case 'new_page':
+			check_nonce('new-page');
+			if( !insertpage($page) )
+			{
+				adminlog("Error inserting page.", MTS_PAGE, MTA_INSERT, E_ERROR);
+				mtdie('There was an error inserting the page into the database.', 'SQL Error');
+			}
+			break;
+			
+		case 'savepage':
+			check_nonce('save-page-' . $page->url_name);
+			updatepage($page);
+			break;
+	}
+	if( $upload_info ) $info.=$upload_info;
+	if( $upload_error ) $error.=$upload_error;	
+	if( $error ) $action='edit';
+
+	if( 'post' == $action ) _redirect( ADMIN_PATH . '/manage-pages.php?saved=success' );
+
+	$info.= '<p>' . ( $page->status === 'draft' ? 'Page draft saved.' : sprintf('Page published. <a href="%s%s/static.php?name=%s">View on site</a>.', SITE_HOST, SITE_PATH, $page->url_name) ) . '</p>';
+
+} elseif( !$page->url_name ) {
+	mtdie('Attempted to edit page with no name supplied.', 'Bad Request');
+}
+
+/////////////////////// Display Edit Form ///////////////////////
+
+
+adminhead('Edit Page');
+adminmenu('manage-pages.php');
+
+
+?>
+
+<script language="javascript" type="text/javascript" src="include/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "exact",
+	elements: "content",
+	theme : "advanced",
+	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,undo,redo,link,unlink,code,formatselect",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	theme_advanced_blockformats : "p,h3,h4,h5,h6"
+});
+</script>
+
+
+<h2>Editing Page "<?php echo htmlentities($page->title, ENT_COMPAT, 'UTF-8') ; ?>"</h2>
+
+<form enctype="multipart/form-data" action="edit-page.php" method="post" name="post" id="post">
+<?php nonce_field('save-page-'.$page->url_name); ?>
+<input type="hidden" name="action" value="savepage" />
+
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="pagenamediv" class="dbx-box">
+<h3 class="dbx-handle">Page URL Name</h3>
+<div class="dbx_content">
+	<input type="text" name="page_name" value="<?php echo $page->url_name ?>" />
+</div>
+</fieldset>
+
+<fieldset id="statusdiv" class="dbx-box">
+<h3 class="dbx-handle">Published Status</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="page_status" value="draft" <?php echo $page->status == 'draft' ? 'checked="checked"' : ''; ?>/>Draft</label>
+	<label><input type="radio" name="page_status" value="published" <?php echo $page->status == 'published' ? 'checked="checked"' : ''; ?>/>Published</label>
+</div>
+</fieldset>
+
+
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="title" size="40" tabindex="1" value="<?php echo htmlentities($page->title, ENT_COMPAT, 'UTF-8'); ?>" id="title" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Page</legend>
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="13" cols="40" name="content" tabindex="3" id="content"><?php echo htmlentities($page->body, ENT_COMPAT, 'UTF-8'); ?></textarea></div>
+</fieldset>
+
+
+
+<p class="submit">
+ <input name="save" type="submit" id="save" tabindex="3" value="Save and Continue Editing" style="font-weight: bold;" />
+ <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="Publish" />
+</p>
+
+
+
+<div class="dbx-b-ox-wrapper">
+
+<fieldset id="cssdivrich">
+	<legend>Optional CSS</legend>
+
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea rows="13" cols="40" name="style" tabindex="6" id="style"><?php echo htmlentities($page->style, ENT_COMPAT, 'UTF-8'); ?></textarea></div>
+
+</fieldset>
+
+</div>
+
+
+</div>
+</form>
+
+<?php adminfooter() ?>
diff --git a/edit-rant.php b/edit-rant.php
new file mode 100644
index 0000000..ff7fff9
--- /dev/null
+++ b/edit-rant.php
@@ -0,0 +1,346 @@
+<?php
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$rant = new Rant();
+$rant->id = (int)$_REQUEST['rant_id'];
+$rant = getrant($rant->id);
+
+if( $_POST ) {
+	$rant->published = strtotime( $_POST['rant_date'] );
+	$rant->status = $_POST['rant_status'] == 'published' ? 'published' : 'draft';
+	$rant->side = $_POST['rant_side'] == 'left' ? 'left' : 'right';
+	$rant->author = (int)$_POST['rant_author'];
+	$rant->title = $_POST['title'];
+	$rant->body = preg_replace('/&nbsp;/', '', $_POST['content']);
+	$rant->link = $_POST['link'];
+	$rant->imagetext = $_POST['rant_imagetext'];
+
+	if( USING_TIDY ) {
+		$tidy = new tidy;
+		$config = $tidy->getConfig();
+		$tidy->parseString( $rant->body, $config, 'UTF8' );
+		$tidy->cleanRepair();
+		$rant->body = tidy_get_output($tidy);
+	}
+
+	$action = isset($_POST['publish']) ? 'post' : 'edit';
+	
+	if( isset( $_POST['publish'] ) ) $rant->status = 'published';	// If [publish] button is used, ignore radio button
+
+	
+	$source_rantimage_filename = $_FILES['ranterImage']['tmp_name'];
+	extract( pre_upload_rant_image( $source_rantimage_filename ) );
+	if( $upload_error ) $error.=$upload_error;
+
+	$source_rantattachment_filename = Array();
+	for($i = 0; $i < count($_FILES['rant_attachment']['error']); $i++) {
+		if( !is_valid_upload('rant_attachment', $i) ) {
+			$error .= "<p>Attachment $i was not uploaded properly</p>";
+			$source_rantattachment_filename[] = '';
+		} else {
+			$source_rantattachment_filename[] = $_FILES['rant_attachment']['tmp_name'][$i];
+		}
+	}
+	
+	switch( $_POST['action'] ) {
+		case 'new_rant':
+		
+			check_nonce('new-rant');
+	
+			if( ! $doing_upload ) {
+				// Use default rant image for this contributor.
+				$contributor = get_userdatabyid( $rant->author );
+				$image_data = getimagesize(SITE_PATH_ABS .'/'. SITE_RANT .'/'. $contributor->default_image);
+				$rant->imagetype = $image_data[2] ? $image_data[2] : 'NULL';
+				$source_rantimage_filename = $contributor->default_image;
+			} else {
+				$rant->imagetype = $upload_imagetype;
+			}
+	
+			$rant->id = insertrant($rant);
+			if( $rant->id === false )
+			{
+				adminlog("Error on rant insertion: ".mysql_error(), MTS_RANT, MTA_INSERT, E_ERROR);
+				mtdie('There was an error inserting the rant into the database.', 'SQL Error');
+			}
+
+			for($i = 0; $i < count($source_rantattachment_filename); $i++) {
+				if('' == $source_rantattachment_filename[$i]) continue;
+
+				$upload_error = $upload_info = '';
+				extract( save_upload_rant_attachment($_FILES['rant_attachment']['tmp_name'][$i], $rant->id) );
+
+				if( $upload_error ) $error.=$upload_error;	
+				if( $upload_info ) {
+					$info .= $upload_info;
+					$rant->body = preg_replace('/(href|src)=\"([^\"]*?)\\{'.($i+1).'\\}(.*?)\"/', '\1="'.get_rantattachment_filename($rant_attachment_id).'"', $rant->body);
+				}
+			}
+
+			if(count($_FILES['rant_attachment']['error']) > 0)
+				updaterant($rant);
+
+			if( $doing_upload ) {
+				extract( save_upload_rant_image( $source_rantimage_filename, $rant ) );
+				if( $upload_info ) $info.=$upload_info;
+				if( $upload_error ) $error.=$upload_error;	
+			} elseif($rant->imagetype != 'NULL') {
+				extract( save_stock_rant_image( $source_rantimage_filename, $rant ) );
+				if( $upload_info ) $info.=$upload_info;
+				if( $upload_error ) $error.=$upload_error;	
+			}
+			
+			break;
+			
+		case 'saverant':
+
+			check_nonce('save-rant-' . $rant->id);
+			
+			if( isset( $_POST['rant_reverttodefaultimage'] ) ) {
+				// Use default rant image for this contributor, copy it into place
+				$contributor = get_userdatabyid( $rant->author );
+				$imagedata = getimagesize(SITE_PATH_ABS .'/'. SITE_RANT .'/'. $contributor->default_image);
+				$rant->imagetype = $imagedata[2] ? $imagedata[2] : 'NULL';
+				if($rant->imagetype != 'NULL')
+					extract( save_stock_rant_image( $contributor->default_image, $rant ) );
+				adminlog("Reverting to user's default rant image for rant ".$rant->id.".", MTS_RANT, MTA_UPDATE);
+				
+			} elseif( $doing_upload ) {
+				$rant->imagetype = $upload_imagetype;
+				extract( save_upload_rant_image( $source_rantimage_filename, $rant ) );
+				adminlog("Uploading new rant image for rant ".$rant->id.".", MTS_RANT, MTA_UPDATE);
+				if( $upload_info ) $info.=$upload_info;
+				if( $upload_error ) $error.=$upload_error;	
+			}
+
+			foreach($_POST['delete_attachment'] as $attachment)
+				deleteattachment($attachment);
+
+			$existing_attachments = $mtdb->getAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = '.$rant->id.' ORDER BY id');
+			for($i = 0; $i < count($existing_attachments); $i++) {
+				$rant->body = preg_replace('/(href|src)=\"([^\"]*?)\\{'.($i+1).'\\}(.*?)\"/', '\1="'.get_rantattachment_filename($existing_attachments[$i]->id).'"', $rant->body);
+			}
+			
+			for($j = $i; $j < count($source_rantattachment_filename) + $i; $j++) {
+				if('' == $source_rantattachment_filename[$j - $i]) continue;
+				
+				$upload_error = $upload_info = '';
+				extract( save_upload_rant_attachment($_FILES['rant_attachment']['tmp_name'][$j - $i], $rant->id) );
+
+				if( $upload_error ) $error.=$upload_error;	
+				if( $upload_info ) {
+					$info .= $upload_info;
+					$rant->body = preg_replace('/(href|src)=\"([^\"]*?)\\{'.($i+1).'\\}(.*?)\"/', '\1="'.get_rantattachment_filename($rant_attachment_id).'"', $rant->body);
+				}
+			}
+
+			updaterant($rant);
+			
+			if($rant->status != 'draft' && $_POST['broadcast'] &&
+					($rant->published <= mktime(0,0,0, date('m'), date('d')-1, date('Y'))))
+			{
+				rsspost('Rant '.$rant->id.' updated.', SITE_HOST.SITE_PATH.'/rant/'.$rant->id);
+				twitterpost('Rant '.$rant->id.' updated: '.SITE_HOST.SITE_PATH.'/rant/'.$rant->id);
+			}
+
+			break;
+	}
+	if( $error ) $action='edit';
+
+	if( 'post' == $action ) _redirect( ADMIN_PATH . '/manage-rants.php?saved=success' );
+
+	$info.= '<p>' . ( $rant->status === 'draft' ? 'Rant draft saved.' : sprintf('Rant published. <a href="%s%s/index.php?rant_id=%d">View on site</a>.', SITE_HOST, SITE_PATH, $rant->id) ) . '</p>';
+
+} elseif( !$rant->id ) {
+	mtdie('Attempted to edit rant with no rantid supplied.', 'Bad Request');
+}
+
+/////////////////////// Display Edit Form ///////////////////////
+
+
+adminhead('Edit Rant');
+adminmenu('manage-rants.php');
+
+?>
+
+<script language="javascript" type="text/javascript" src="include/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	theme_advanced_buttons1 : "save,newdocument,|,bold,italic,underline,strikethrough,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontsizeselect,|,cut,copy,paste,pastetext,|,bullist,numlist,|,outdent,indent,blockquote,|,undo,redo,|,link,unlink,anchor,image,|,cleanup,code,|,insertdate,inserttime,preview,|,forecolor,backcolor",
+	theme_advanced_buttons2 : "hr,removeformat,visualaid,|,sub,sup,|,charmap,emotions,iespell,media,advhr,|,fullscreen,|,visualchars,nonbreaking,template,blockquote,pagebreak,|,insertfile,insertimage",
+	theme_advanced_buttons3 : "",
+	plugin_preview_width : "350",
+	plugin_preview_height : "700",
+	language:"en",
+	theme_advanced_toolbar_location:"top",
+	theme_advanced_toolbar_align:"left",
+	theme_advanced_statusbar_location:"bottom",
+	theme_advanced_resizing:"1",
+	theme_advanced_resize_horizontal:"",
+	paste_convert_middot_lists:"1",
+	paste_remove_spans:"1",
+	paste_remove_styles:"1",
+	gecko_spellcheck:"1",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style],iframe[src|width|height|scrolling|frameborder|style]",
+	theme_advanced_blockformats : "p,h3,h4,h5,h6",
+	plugins:"safari,inlinepopups,autosave,paste,media,fullscreen,contextmenu,advimage,advlink,visualchars,preview"
+});
+</script>
+
+<h2>Editing Rant "<?php echo htmlentities($rant->title, ENT_COMPAT, 'UTF-8') ; ?>"</h2>
+
+<form enctype="multipart/form-data" action="edit-rant.php" method="post" name="post" id="post">
+<?php nonce_field('save-rant-'.$rant->id); ?>
+<input type="hidden" name="action" value="saverant" />
+<input type="hidden" name="rant_id" value="<?php echo $rant->id; ?>" />
+
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="slugdiv" class="dbx-box">
+<h3 class="dbx-handle">Side</h3>
+<div class="dbx-content"><select name="rant_side">
+<?php
+  $sides = array('left'=>'Left','right'=>'Right');
+  foreach( $sides as $k=>$v ) {
+  	printf('<option value="%s" %s>%s</option>', htmlentities($k, ENT_COMPAT, 'UTF-8'), ($rant->side == $k ? 'selected="selected"' : '' ), htmlentities($v) );
+  }
+?>
+</select></div>
+</fieldset>
+
+<fieldset id="authordiv" class="dbx-box">
+<h3 class="dbx-handle">Author</h3> 
+<div class="dbx-content"><select name="rant_author"><?php
+	$contrib = $mtdb->getAll('select id,name from contributor');
+	foreach( $contrib as $k=>$v ) {
+		printf('<option value="%s" %s>%s</option>', htmlentities($v->id, ENT_COMPAT, 'UTF-8'), ( $v->id == $rant->author ? 'selected="selected"' : '' ), htmlentities($v->name) );
+	} ?>
+</select></div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Post Date</h3>
+<div class="dbx-content"> <input type="text" name="rant_date" value="<?php echo htmlentities( date( 'Y-m-d H:i:s', $rant->published )); ?>" /> </div>
+</fieldset>
+
+<fieldset id="statusdiv" class="dbx-box">
+<h3 class="dbx-handle">Published Status</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="rant_status" value="draft" <?php echo $rant->status == 'draft' ? 'checked="checked"' : ''; ?>/>Draft</label>
+	<label><input type="radio" name="rant_status" value="published" <?php echo $rant->status == 'published' ? 'checked="checked"' : ''; ?>/>Published</label>
+</div>
+</fieldset>
+
+<?php if($rant->status != 'draft') { ?>
+<fieldset id="broadcastdiv" class="dbx-box">
+<h3 class="dbx-handle">Broadcast Update</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="broadcast" value="0" checked="checked" />No</label>
+	<label><input type="radio" name="broadcast" value="1" />Yes</label>
+</div>
+</fieldset>
+<?php } ?>
+
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="title" size="40" tabindex="1" value="<?php echo htmlentities($rant->title, ENT_COMPAT, 'UTF-8'); ?>" id="title" /></div>
+</fieldset>
+
+<fieldset id="linkdiv">
+	<legend>Link</legend>
+	<div><input type="text" name="link" size="40" tabindex="2" value="<?php echo htmlentities($rant->link, ENT_COMPAT, 'UTF-8'); ?>" id="link" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Post</legend>
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="13" cols="40" name="content" tabindex="3" id="content"><?php echo htmlentities($rant->body, ENT_COMPAT, 'UTF-8'); ?></textarea></div>
+</fieldset>
+
+
+
+<p class="submit">
+ <input name="save" type="submit" id="save" tabindex="3" value="Save and Continue Editing" style="font-weight: bold;" />
+ <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="Publish" />
+</p>
+
+
+
+<div class="dbx-b-ox-wrapper">
+
+<fieldset id="rant-image" class="dbx-box">
+	<h3 class="dbx-handle">Image</h3>
+	<div>
+	<table border="0">
+	<tr><td valign="top">
+	<?php
+
+		$contributor = get_userdatabyid( $rant->author );
+		$rantimage_filename = get_rantimage_filename($rant);
+		if( ! file_exists( SITE_PATH_ABS.'/' . $rantimage_filename )) {
+			// no image in place yet
+			$rantimage_filename = SITE_RANT.'/' . $contributor->default_image;
+			if( file_exists( SITE_PATH_ABS.'/' . $rantimage_filename )) {
+				echo 'Currently using default rant image for this contributor. <a href="user-edit.php?edit='.$currentuser->id.'">Change default</a>.';
+			} else {
+				$rantimage_filename = false;
+				echo 'There is currently no image associated with this rant, <br/>and no default rant image associated with this contributor.
+				<br/><a href="user-edit.php?edit=' . $currentuser->id . '">Add a default rant image to your profile.</a>';
+			}
+		} else {
+			echo 'Custom rant image is specified.';
+		}
+	?>
+	
+	<p>Upload new rant image:<br/>
+		<input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
+		<input name="ranterImage" type="file"/>
+	</p>
+	<p><input type="checkbox" name="rant_reverttodefaultimage" /> Revert to default rant image.</p>		
+	</td><td>
+	<?php if ( false !== $rantimage_filename ): ?>
+		<p><img src="<?php echo SITE_HOST . '/' . SITE_PATH . '/' . $rantimage_filename; ?>" width="150" /></p>
+	<?php endif; ?>
+	</td></tr>
+	<tr><td>
+		<p>Rant image alt text:</p>
+		<input type="text" name="rant_imagetext" size="40" tabindex="2" value="<?php echo $rant->imagetext; ?>" id="rant_imagetext" />
+	</td></tr>
+	<tr id="rant_attachments"><td>
+		<p>Attach files:</p>
+		<ol id="rant_attachment_list">
+		<?php
+			$attachments = $mtdb->getAll('SELECT ra.id AS id, extension FROM rant_attachment ra JOIN media_t ON ra.media = media_t.id WHERE ra.rant = '.$rant->id.' ORDER BY id');
+			foreach($attachments as $k=>$v)
+				printf('<li><input type="checkbox" name="delete_attachment[]" value="%d" /> <a href="%s/%s/%s">%s</a></li>', $v->id, SITE_HOST, SITE_PATH, get_rantattachment_filename($v->id), get_rantattachment_filename($v->id));
+		?>
+		</ol>
+		<p>(Checked attachments will be deleted on submit.)</p>
+		<script src="include/rants.js" type="text/javascript"></script>
+		<a href="#rant_attachments" onclick="new_rant_attachment()">(add attachment)</a>
+	</td></tr>
+	</table>
+	</div>
+</fieldset>
+
+</div>
+
+
+</div>
+</form>
+
+<?php adminfooter() ?>
diff --git a/edit-type.php b/edit-type.php
new file mode 100644
index 0000000..a53873a
--- /dev/null
+++ b/edit-type.php
@@ -0,0 +1,51 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$type = get_typeByID( $_GET['edit'] )
+	or mtdie("Invalid type number!");
+
+$metas = get_allMetaTypes();
+
+adminhead('Types');
+adminmenu('manage-types.php');
+
+?>
+
+<h2>Edit Type Information</h2>
+
+<form action="manage-types.php" method="post" name="post" id="post">
+<?php nonce_field('save-type-'.$type->id); ?>
+<input type="hidden" name="action" value="edit_type" />
+<input type="hidden" name="type_id" value="<?php echo $type->id; ?>" />
+
+<div id="poststuff">
+
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Name</th>
+	<td width="66%"><input name="name" type="text" id="name" value="<?php echo htmlentities($type->name); ?>" /></td>
+	</tr>
+	<tr>
+	<th scope="row" width="33%">Description</th>
+	<td width="66%"><input name="description" type="text" id="description" value="<?php echo htmlentities($type->description); ?>" /></td>
+	</tr>
+	<th scope="row" width="33%">Metatypes</th>
+	<td width="66%">
+	<?php
+		foreach($metas as $s) {
+			echo '<input id="c-' . $s->id . '" type="checkbox" name="meta[' . $s->id . ']"' . ( _objectInArrayWithIdExists( $s->id, $type->meta ) ? ' checked="checked"' : '') . '/> <label for="c-' . $s->id . '">' . $s->name . '</label><br/>';
+		}
+	?></td>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Save &raquo;" name="submit" /></p>
+
+</div>
+
+</form>
+
+<?php adminfooter(); ?>
diff --git a/fredart_parse.php b/fredart_parse.php
new file mode 100644
index 0000000..c1b2c41
--- /dev/null
+++ b/fredart_parse.php
@@ -0,0 +1,58 @@
+<?php
+	/******************************
+	*  This script dependent on   *
+	* XML_Feed_Parser PEAR module *
+	******************************/
+
+	require_once('include/admin.inc.php');
+	require_once("PEAR.php");
+	require_once("XML/Feed/Parser.php");
+
+	// Workaround since DreamHost disables allow_url_fopen
+	$ch = curl_init();
+	$timeout = 5; // set to zero for no timeout
+	curl_setopt ($ch, CURLOPT_URL, FEED_URL);
+	curl_setopt ($ch, CURLOPT_RETURNTRANSFER, 1);
+	curl_setopt ($ch, CURLOPT_CONNECTTIMEOUT, $timeout);
+	$feed_src = curl_exec($ch);
+	curl_close($ch);
+
+	// Use if allow_url_fopen not disabled
+	// $feed_src = file_get_contents(FEED_URL);
+
+	$feed = new XML_Feed_Parser($feed_src);
+
+	for ($count = 0; $count < 5; $count++) {
+		$entry = $feed->getEntryByOffset($count);
+		$link = mysql_real_escape_string($entry->link);
+		$title = mysql_real_escape_string($entry->title);
+		$date = $entry->pubdate;
+
+		$mtdb->query("INSERT INTO fredart (pubdate, title, link)
+			VALUES (FROM_UNIXTIME($date), '$title', '$link')", false);
+	}
+	
+	header('Content-Type: text/xml');
+	header('Content-Length: 440');
+?>
+<?php echo "<?xml version=\"1.0\" ?>\n"; ?>
+<methodResponse>
+  <params>
+    <param>
+      <value>
+	<struct>
+	  <member>
+	    <name>flerror</name>
+	    <value>
+	      <boolean>0</boolean>
+	    </value>
+	  </member>
+	  <member>
+	    <name>message</name>
+	      <value>Thanks for the ping.</value>
+	  </member>
+	</struct>
+      </value>
+    </param>
+  </params>
+</methodResponse>
diff --git a/images/box-bg-left.gif b/images/box-bg-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..c3c7e3595048ab96d25df5038059bd08d7705036
GIT binary patch
literal 37
pc${<hbh9u|WMW`rXkcRa^5x6#-@kPjfB+=Iz{JASvz(Q|8UW3w3AX?M

literal 0
Hc$@<O00001

diff --git a/images/box-bg-right.gif b/images/box-bg-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..12a0d1af053dea0a6dc8b0614a558922b69f5098
GIT binary patch
literal 151
zc${<hbh9u|e8J4daEOKB_wV0dzI=K0>eZb)cm5**9R?r(sbOGF@z{0epTQ~5)q5>o
zpWXdGL8C7vb6&=(bvdv173iGbV$8u9@V@5#{{ssOJanY`Pb?{#x$EhS3oA;z)<&(r
yv8L?wUyIVa8!CMCW}kntrRwgFP4_?SsPS8W`@NTW-TC*w|2H%?g~W3*SOWmh<yQ9q

literal 0
Hc$@<O00001

diff --git a/images/box-bg.gif b/images/box-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..2eb7f58240d65642c84c50658edce03e42c74deb
GIT binary patch
literal 111
zc${<hbhEHb+{3`eu!w=-_wV0dzI=K0>eZb)cmDtX&j168KUu)E4u}A$WnebpaJ=)+
z;FRa;y%w*}z7}9yP?C~4FJqNayv4c#o%35RcX_XUU&DV_e|~|731jimB}G4(8HE_E
E0l|_iOaK4?

literal 0
Hc$@<O00001

diff --git a/images/box-butt-left.gif b/images/box-butt-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..590c2efe5e950c0e1b6737edd4f60f2d4239c303
GIT binary patch
literal 169
zc${<hbh9u|<Y3@pXpv_4^XJdszkmPz`}g(h*Kgmxeg6FU?%liJzkmPm;ltavZ-4#z
z_44J*A3uJ)e*OCX{rm6Vzkl-N$%6+Eo<D#7@ZrNxpFTZ$^yu;9$9L}B`SRt<t5>gn
z|Ni|S73eSk0mv=}R=ovgIVqexPM%CH%kmh5_cR5aS;`>eVYI`5mvLi*iwEP`g&#bo
QFfp(;FA(BbpvYhi0AXNk=>Px#

literal 0
Hc$@<O00001

diff --git a/images/box-butt-right.gif b/images/box-butt-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..487ebb3617a35b588af0a9cd99b28168ecc56965
GIT binary patch
literal 960
zc$@*i13&ynNk%w1VTcn70E8O={QUg={r&#_{`K|s_V)Jk^Yh)^-S_wR@bK{M?d|&d
z`swNE`1tti>+9d&-|z45<mBYw;Na)y=i%Yu^78WH;^O1u<J{cb^z`)V>gxOZ`~Uy{
z|NsC0|NsC0|NsC0EC2ui0EiO`000I4;3ke_X`X1Ru59bRa4gSsZQppV?|kq7z@TtQ
zEE<o<q;kn@I-k&}bV{vSuh^`1%k6r<;IMd1E}PHjw0g~MyWjA*d`_?1@A$la&+q&H
zfPsR8P8S&i8ib0AjE#<ukdcy;l$Dm3n3<ZJoSmMZprN9pq@|{(sHv)}tgWuEu(4|a
z1`PuMvbnmuyuH4^z`?@9#Kp$P$jQpf%+1cv(9zP<)YaC?7!C;pxYyp_;Njxq<mKk)
z=;`X~?CtLF@bU8V^!4`j0uvSw3<3B500RmfNU)&6g9sBUT*$DY!-o(fN}NcM-2w*-
z3Mddzv7^V2AVZ2ANwTELlPLaEs$9vkrOTHvWl^Z$KmvjT00bD=$+M@=pFo2O9qRLf
z(W6L{DqYI7sne%Wqe`7hwW`&tShH%~%C)Q4uVBN99ZR;X*|TWVs$I*rt=qS7<I0^&
zx31m0c=PJr%eSxJzkmY^9!$8f;lqd%D_+dFvE#>(BTJr4xw7TUm@{kM%(=7Y&!9t#
z9!<Km>BK}0M1ZgW0RavE8pxhaySDAyvNP!3&AYen-@t<lA5Ofu@#DyoD__pMx%21H
zqf4Joy}I@5*t2Wj&b_<$@8H9WA5Xr#`Sa-0t6$H)z5Dm@<IA5<zrOwZ`19-E&%eL_
z{{RLk;D7`cXyAbeCjO}4f($n3;DZoGDB*+@R%qdc7-p#9hQuZCKmiB9Cc*$DmT2OM
zD5j|5iY%Up!HY1)DC3MY)@b96IOeG1jy(40<BvcFDddnu7HQ;>NG7S|l1w(~<daZF
zDdm(@R%zvxSZ1l^mRxq}<(FWFDdw1DmTBghXr`&=nryb|=9_TFDd(JY)@kRRc;>0+
zo_zM{=bwNED(Iku7Ha6Bh$gD&qKr1`=%aGBH~;|*C;)&zA^@Q2rkr-_>8GHEDr%=1
zlxpg!sHUpws;su^>Z`EED(kGY)@tjmxaO+suDtf@>#x8DE9|hu7HjOW$R?}ovdlK?
z?6c5DEA6z@NLFj@wb*8>?Y7)@>+QGThAZy4<d$phx#*^=?z-%@>+ZYo#w+i<^ww+d
iz4+#<@4o!@>+in+2Q2Ww1Q(3%sG0^K07oN)0027^z)Y0@

literal 0
Hc$@<O00001

diff --git a/images/box-butt.gif b/images/box-butt.gif
new file mode 100644
index 0000000000000000000000000000000000000000..514a165e255ef73e01ce4b5b5caed1dc5c778b30
GIT binary patch
literal 347
zc$@)S0i^y%Nk%w1VY~ne0K@<Q{QUg={r&#_{`K|s_V)Jk^Yh)^-S_wR@bK{M?d|&d
z`swNE`1tti>+9d&-|z45<mBYw;Na)y=i%Yu^78WH;^O1u<J{cb^z`)V>gxOZ`~Uy{
z000000000000000A^8LV00000EC2ui0K5PS000Hppf+q|X`X1Ru59bRa4gSsdu4+L
z3_|Vyz@TtQ3>X>%0Dzz&I-k&}bcJyw2!H^iFztH3;FVxvc`yP3MS&Y`yWhcuV^L5D
z1b_n~k%RmHfFv3e6%G;z2LL?*8UzRn5D^9j7nPQmn3<ZJoSmMZprN9pq@t4%5DN%Q
z0VRwF1rG@g8MU^zxVgH!yuH4^z`?@9#Ka8=4+RGrttJ5g3Je4T0~prV*xB0K+}+;a
t;Njxq<mKbk1PlsUDR<9G8u9Y;^!4`l`1$(#{Qds_0R1V+a>qmn06X~Sw^#rG

literal 0
Hc$@<O00001

diff --git a/images/box-head-left.gif b/images/box-head-left.gif
new file mode 100644
index 0000000000000000000000000000000000000000..b03e075ef0a45bc505da136a237fcbdfe09fd591
GIT binary patch
literal 334
zc${<hbh9u|WM`0MSZczc*1AruZM|yKTIHHmD)p;X8rLY6FIOyE{_54MJ9qB<`Sa)R
z-@pI<{rmd$>#twGzJ2@l<HwJmKYxDz{{8dk&nfc{zJ2>vxqSKYyD#<X*O)i2|M1~M
z=(OE0U%q_*{{88DukPQ!|N8ao6Zc-;y?giZ<HzAM_Ncb3Q?6dA-myWsc9m-LTE&Xx
z>h0^5Dpshqu2-sBsnW1UsdB}aFJFHD{;g2D>^~7ehXDvceqmrMc9=EcSb|O)cPq0}
z%n7AUi!T>0Op)mFIAJu~P^Rl_;+_TrgSIV?9D{d;cCq!krk{MW!Nx~y@y>sGH705;
zYE8@?%uO0S8ci${Seo>w=r^&>U~OWW!_=g?K(k48iE0zW3Wg@#HM&iV8yK6kw`e!1
K?@)JSum%8@vc7)+

literal 0
Hc$@<O00001

diff --git a/images/box-head-right.gif b/images/box-head-right.gif
new file mode 100644
index 0000000000000000000000000000000000000000..897b03aca69664817c5a7a928ecd2e271fa22362
GIT binary patch
literal 3609
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
aW1TO!{(NBlh4^|uWc>kI?4PWxg8mO>4_@>D

literal 0
Hc$@<O00001

diff --git a/images/box-head.gif b/images/box-head.gif
new file mode 100644
index 0000000000000000000000000000000000000000..5c09a9ae0810da2d923470dcc42dbc7c959e2188
GIT binary patch
literal 879
zc$@)m1CabjNk%w1VY~nt0M!5hCWWphhOZ@pts{J@B!8<Ufvh2Sry+Ky>gwv;+}!;9
z{Qdp?{{H^;_4WGt`u6tr`1ttw`T6(v_w)1fWS_z9?d>CXr^nstE`O{ygRk)L@Ku((
z>FMe3@9)dr>fhhr>+9>t-s#=l-Q(lqSD3sdgsvldsV9iABYmnRgRLQWrzeN6B6z4K
zg|8xdsU(1`B6+Cv^z{4t`yh3u|Ns9000000000000000000000000000000000000
z00000A^8LV00000EC2ui0K5Ph000L6K$?)oU@R0!nR3Z&I-k&}bV{vSuh{GrsaO<;
z;G+ZbXf$Hzw0g~MyWjA*d`_?1?{)J7;^=~D3o;Qh3x9@(h>41ejE#<ukdcy$3lT9B
z5`;s64i^*|GohlRq@|{(sHv)}tgWuEu(2~46c-a351I@L5g`_`z`?@9#KpoE9u*oA
z3PpVz2hq~g)YaD4*xB0K+}+;a;NjLJ5*!l_Mi2}b2JP<e@bU8V^!4`l`1$(#{QdG6
z3r2K+aO43E6$le5T*$DY!-o(fN}NcsqQ#3CAJX_x;Q^8cG+2lnNwTELlPFWFT*<Pf
z%a<@?%1lW^1c(L-WPpUhv!~DhpFo2O9ZIyQ(W6L{DqYHSD2)UN8YqcD!-dtWShH%~
z%C)Q4uVBN99ZR;X*{)9!#F$FMgxj}p<I0^&x31m0c=PJr%eSxJx@p(SpgN$i;lqd%
zD_+dFvE#>(BTJr4xiaIxY*A?5%(=7Y&!9t#9!<Km>C>oFs}7BMFbx8*W6PdRySDAy
zxO3~?&AYen-@tFTruw3|@#DyoD__pMx%21Hqf4Joy*l&ZGzw_n&b_<$@8H9WA5Xr#
z`Sa-0s}GM|fcy9G<IA5<zrOwZ`19-E&%eL_`q-r);D7`cXyAbeCaB<o3^wTCgAhh2
zVS?C|VBv)rW~kwY9Cql8;fElGDB_4DmS|#!*a4v8iY&J1;)^iGDC3MY)@b96IOeEh
zjM%l{<BvcFDddnu7HQ;>NG7S|l1w(~WRchfAmx-)R%zvxSZ1l^mRxq}<(FWFDQ1?~
ztzhPvXr`&=nryb|=9_TFDd(JY)@f&(*qxx~o_zM{=bwNED(Iku7Ha6Bh$gCNpqK>#
F06T}^*w_F7

literal 0
Hc$@<O00001

diff --git a/images/browse-happy.gif b/images/browse-happy.gif
new file mode 100644
index 0000000000000000000000000000000000000000..09f13bc3c77d38bbf59d7a1d076df9fc1342c1d0
GIT binary patch
literal 4398
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
F{0~q~^Em(j

literal 0
Hc$@<O00001

diff --git a/images/fade-butt.png b/images/fade-butt.png
new file mode 100644
index 0000000000000000000000000000000000000000..42f08b79942d32f9d7e693b6952c2d935e352774
GIT binary patch
literal 785
zc$}@0-%C?r7{}lJaEviwE_2xsM>W!c5E8WuFFd-XQzv3Ngb=r}qa}nD+7BAErUM%i
zB4QU3$uhbyt)L5qU5Jiq1X9pNcoCyU?EKjIwR6sP&d#WJ|3f^y@5B4@;ro5Q@H`nB
z?5Q=JHUI!>J-x1B*z4hG(QDwHrX3h;+9||~0Pyzn<(hc)-8kzWo4q<SIeRZ~2L(uI
zCWzWRHv?1XFd7IwxSd8jAcPMMjJWe8DF_0U&nt?8V;Doz1&%8gi?S?}1i^7!sZ`<%
zJj*aF!}5Hg0x=wdm{gKPL10;?C>BYQ<awT^>0(hN37q3tsZ^3=nJ*Lwf)E4|$8ZwI
zDT<==d0Cc}3iQemcvT6{<!FkAIIN;5QdFL%DOr*ToFH(F#EAmS6*yKYmt{$YLr9WL
zQxro}q9_s=&QP=@l?XUF!zxOJsaik{N|Gc&6e<;kW!ZAMjOB8Fjoa-2sJ1;WWaR#F
z&~&SA$l`DC>(0zg+Dy#wlumEcHJ|gVUa8cJj}N=OPc@6q?04sqGaLDFY_>&C?V@vg
zF%;d4HN}M8Jz)Wj&Fw)JiH}e8#mD;w;?Kt?29}!isT6<;b$VC5dw=t_{_HaPNpI>j
zatha>m^(UGdb*-7dZNv}Kx@)i){Rz+#cF-lXk9lhw;oO&)j%|y2q%uh;bbzL{OJoP
zlF4Ku0aU4tm%sO?ueYQfH@-Mp(+2g*4*bk~4DF{jr#F5br8W}>Ax&tjT?K{bo%6d+
zjdroy69K`@NM`lYs4tUUUGuH^F8Karvlpvz8_pw$_aV}Toba}tK<svJ8)ApJDOhJV
z2Lpj`Uv)uS|GfK}6{Zir2N7`KfJw$`RBHW}trG-JYW21^QJ`8FHQ6HX3~H^(hx|`S
Y1NyTc?%E$+8HMW#Jnli)PM1IW5A4a1l>h($

literal 0
Hc$@<O00001

diff --git a/images/heading-bg.gif b/images/heading-bg.gif
new file mode 100644
index 0000000000000000000000000000000000000000..bea18ca5ea3fbb96507cf6c8698ea7e37ad56445
GIT binary patch
literal 37
nc${<hbh9u|WMmLvXkcV``uRT)=r8~QNQ8ljrKO*fmBAVS&$|h%

literal 0
Hc$@<O00001

diff --git a/images/login-bkg-bottom.gif b/images/login-bkg-bottom.gif
new file mode 100644
index 0000000000000000000000000000000000000000..a78656eb8486cbf77d666e39176e7072097abd19
GIT binary patch
literal 704
zc${<hbhEHbY-1E*xXQrr>({UM@87?A_3Hcg?>~S3eE$6T)2C0ref#$H>(?(|zC3yI
z<mJnkKYsl9`0?Z8$B*B=d-wM3+t;sOKYRA<#ful8K7CrgW#5NSpQY_0J7%qT{_3rw
zb8LR=w6!}A377=hMiow6xK7h6`OTX*kwtA+Zrv9)4=(SS^Wx2i7jHlGuiU$8@99<h
z&i1d^{piu7&!0d4{{5TR$e)2kp!kyoOzVIMke?XX{yR)B5a8r&T`|4rWRBJR3oA;z
z)<&(rv8L?w+p7H!HdySo+T}E{G4ezM$C*_dYy8&Ve*a@nUBB;4Rso)DJqBL3G<DgU
z?w;Ph{s|K+WYyBxco~}YblI}pl_o7*w0OzVW${XB%xt=|^w_x>)09<~Z`;0O=dMx}
z<upca_H``$tl9FrPo6q`X19DcD?iIR22LT7Y>BhC@7%ptCXp>7#5r>v4?ov4cTuVP
z?>~I}<Siwd&A`Rqw62ANDL>n2$_|6|3l26f)0=X_;Dvls>6IuEh8@S4+Ii(16z-hZ
zxL8I&&a7a=0#AoVF@c|g3k)XCKRw+b`P3ZG&CAZtwkUpe=j7()=kLz9^9`DzHrb(@
zlhuYX_SBY@mzM`D_L^%|>d?rk+i`A<*uh4fRSAc?WWBeoxw({4#zmuC_&_6run0>)
z)wXqacUOFVRcfiw(8S5ew`7ecgCheY8_y9Zhw}B0k55qcerA5)L(>r^CWQ;Dgc%x{
zIi(yT6dW6w#a0Bbjyt<+>+9<ql26a`-M#JY?H$Fh@15Pf{r&x&vKkXMFgP`{uygP{
z<7_y{$if-rG2d_RuCK3eY|g%aZtw2z?;jlQmiOPc=jZ1am#6zTJYZ;kI{ESG`TqO&
X{r&yp^XvQP_wWDzpP@^Xg~1vC3*1h{

literal 0
Hc$@<O00001

diff --git a/images/login-bkg-tile.gif b/images/login-bkg-tile.gif
new file mode 100644
index 0000000000000000000000000000000000000000..1e8ccf99dc7d954dd4fb9ae03a60c9df2c397652
GIT binary patch
literal 19727
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

literal 0
Hc$@<O00001

diff --git a/images/notice.gif b/images/notice.gif
new file mode 100644
index 0000000000000000000000000000000000000000..ba6eab02de9413f685e9fc41d699b9efe32747e5
GIT binary patch
literal 156
zc$@*80Av40Nk%w1VGRHc0J9GOI(oPXN{d;V*4O&|sO$da`TPJodfxT><oNvE^!wNF
z`R4ikdAs%E_x$Jj{r~^}A^8LW000jFEC2ui01W^Q000C@@JV%=Jxc0?mir5mY{kbI
z%vX#G@;PVvA(UsL?^3-m{#rbOfxrX427p2FU~>!vN)X0%lR0RQM9D!25FM*cCnwTO
KDwm8T0suSBOiFqH

literal 0
Hc$@<O00001

diff --git a/images/toggle.gif b/images/toggle.gif
new file mode 100644
index 0000000000000000000000000000000000000000..72e8b4499a2685b20dce3644ef0447a0f5b860a1
GIT binary patch
literal 216
zc$@*)04M)PNk%w1VH*H40J9GO#og&bj<!OQxF&w9UZBA~jkG<8vqY7-;Oz6{@AW^A
zw)_13DTJ>-kG0_K^8f$<A^8LW000jFEC2ui02=@@000Dq@X1N5y*TU5yZ>M)j@V!r
z134K0V5m}oAO-vcb713$9u9?okdR0agn>eeQvf)giNzxEbO36ch7&5KJ^_smLm?;=
zjb(v?Ard?Vw!`xfpW6g2IE+zd+x~!of`f#GhKGoWii?XtNRLQL9Zgl0RaYHamX=^*
SWNDyfYmB6&rl+VM5db?0@>*8_

literal 0
Hc$@<O00001

diff --git a/images/wordpress-logo.png b/images/wordpress-logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..3c852f4090c453c5e0bf03a821701aa2c9308599
GIT binary patch
literal 2345
zc$@(#3D)+BP)<h;3K|Lk000e1NJLTq008;`002Y?0{{R3pYqrW00004XF*Lt006JZ
zHwB960000PbVXQnQ*UN;cVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUyX;4g5MSp*P
z5D*Z*zrR30K=1GG&(F`_-`_AWFrS~FARr)MU|>*CP;hW?udlDg%G{5Sk5XTki<G%0
zH+@4=j;OE8@$&Z6*X1=uh2rGynxVpAZJ>RKvA4X_Z+fWU;Naus?iea`00030|NjQN
zTmt|A03&o#PE-H?|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC0|NsC00A?wJmH+?<
z7fD1xRCwC#TiKH9C=A6L-tFv*yL%@1|37j-NJ7}%_tx}u)zo#uOYjoMM;wk8h?<|a
zsTcGY^cVCO^e2R_t1e57Z&@=I&jMYKrA1t}3R;udgSso80D9Uuq^UerI9rs}#-Z!h
zn1*quX-?-=V(N6u(3J(Q0kq0$n(JNf43Jy!ZN63Ld1gvCr;COpj#}&3p0_4Rw+X#S
zj5|m(^GT~6_&zb!7NJ*(8&f;9U$oL*)um~+2fZ>$0pt30v$y73!mfzz4tZyO*)l70
ztx?;8t^s-TYvi>`Vch#oK`%}ETja>}yiW9npex7X-?5!NLFoSZ(6uS8!u=Y#aBIqp
zn}MF0V$Pkm*I5QpTw*^<033QEnyC{A>xM^YC%ACi-{AAKIREXJiyTZ}{5bS9a#*ST
zmBpySFAH(&y~^(e^c`HdKko3kTb%!HTj^~6!_Zs9x>YF!qu!}8oXMohS=(5e_+g*V
z9{ur#myVAk_HIXeet-VYuU7!&h>Z|?{2+8K23<%Unqyp^m~9eM@yvg7(D!(7v3;_F
zHOl=b-cMsNWldiGFm`1pR52G7sW-P#{B$(znSGI@#Dnv}!hI8VxO4ydGcQ;YbT3EQ
zPeQM2>(X0NurRU2Pa7$8S?$<C9QbgA$Nn|y^Pms=X}6p9m+!q`#?U<j|5Z@YtE^Rp
zP01)ZtvY)`&tvDHYhynWdZJ)_v1EKr?~+<A90kdd<<JfN8_L0zB=35fm+E-@80LjA
z+WU6WOih5Eg4{~kFR`w&^u%713mi!6qtFtVqO`TMg{lAvK`B<zn_jy15^O~@fuX*K
zdCz@6{1<n5It|0gfjc@#x8dyo;=hBB3AFI?KDmR#Zs#qv8>EAi(3MU*K#=*$Db!EW
zswFv0SR8B?ZkpcTjh@MvF6}#<H>xr4_<F_ogk&w)7%g0S)`tmxL?awTA51XVGY3Qg
z{Yw~l@&n}mcGSN_+PQ?DlE0rJiRRf~^L+)TSS_BgX@{X(Mzje)&q_a^iWTE~N@pXH
zFW^^|As0Ik%Pq(6q7NSdEgjwXJFJrL>=Vcg?oPrkpu@Z6WCK>do-g8kd7^L@q(o(6
zbdHb!x}&bMShr$4aypM0KZ2R65ZxV+<&NXB4}Lz3UIdPygG%m$4T%Bo?uKCjy$I8g
zpbI77`>cw2)eaC^L!?3D__^+mB)<dWX<%DftN_J#>cG%R;~mFce`3D7c=jN|8W`gt
zg1*NuETDseOc5kk6t;6MkD)8Z$M@Mc(?DVHh1y?Z)#~5@O$43z-K{c~N<!EELXdbr
zLO0KG=%0!2Q^4h$JMj@gpFSUTuLkE;9G~TL482{Ade4L6lki4Ie$pfy4F~AWS5Zwa
zp^yGE6~!9Qa?kMtq%0qv?}wQ09?(@n7p^ge9vB~>Cv7T&dwyBX(3`ZfdQNxc=*k#8
zLQ5LGfKL3b*P*L`Uaz5h#(R$Yfj)SBe*_H^fauCF40maq2>K8~Z_+d@hY)moYD~iP
zRm;#T_;u6ZcT*}o0__F#YQgxDlbZ0*!mJ4I0loXtgLL(TTn$<!0nruT4yXC|(AC!|
zT~Y}rSVNW*((7CyRto)dszf=>5YWp-3^UH%g7G=pC6YN$?1Sg{8NxA~;g8P<f1oQz
z0Dhjo3mvkVDqn^^O1_x|Uq@j%swG4N%CyXJ9Y^h2(^FcuO^q>bC4b;UgmIIoP#j6s
z<c$;0^@Z#Ex6nmmBkwEt&9VX)7?9G1mwTi_5ki_pmf(EGNYaOl??@<QNJET&$O6q7
zD;JMAf4h=ZJn>`fYlXl48hVVK@5?B!<p`(rBA${HEBqHJkQJ=ZH1$h^C5fC8nvO<4
z1hT|<Oxb|(lknrBM0H|Qc<Ax<2>Onn*nSNiB)nP&ymV77q&{=dGf@OkoW96p%`-mN
z;lV8;PH^-^`a(p$3*UVbbhz?tK3`e!QSL4hyM%rTvnC5c*%CS=DD;XdM5Hb}hnvRW
z(4i2=bD?x$3?;47wU5Mi{?W?IUT;|CqVnBIlxI%Nck+99bUrei3n~3clrHZ9`dOqk
zwe&U8LGyc644vy3rH77}@)~q3Wu>=+YWa+%iYQsr#CMjy+;gI#dC|ocgL5cRxc;;V
zV(!)~x4RhO6MKA-q<!#oc)tdVrRJ0RM8(l(#~M{eH3o&$$okyMo96>O$|d-H2}Z#J
zRUEpO#CPUQ3y2d^!(=fIlPJVZQ3d)UiV!<Y;)dgcl6PODxSsw-eZ0QC`83{}Bk#RS
zDWk<MsM7hp0A8W%>aP)N=bdVtZwKfl$6}qgVw=er9m|qgl&p=er=+v5+}Azd6IqsI
zmfu7_F2r8m0O{`SGB2w%dlZ0WJ7PWm)72jpul?3vtqRXB@^ZT*YAofX&MCL<M5jeD
zI*pPw?aWe3>9Zo)Bi~ghMhC`=pzZw4BHaJ6`T|Q3ZIrQ;CNCsctQsWf;w<WZ8w<_R
z!V~j*Y&n!i>FZkzY<gaJ+S+oX*HT@D1P&FZ_rz!x%Z=vGZOcXGZeFJCwDgc8E8<1w
zKOMT*T2QZ-pz`2MZLYVmtp##J3GzEx)u}R%d}|v@#5SUatM#!*)xI*8ZEYKo*gWRd
zJK9&HIXK+n<}tBluv+jP^}y|x-sYCUuu*iJmm6zH`nI}JG;9x^SNq6(VQ0JBgJBg4
zi`K=HZ3>^C`L6);6aN7OM)+C(_Ji5WbN<=uY1#|=3;GNC3;M>}KLQK@JuEX4OGyzW
P00000NkvXXu0mjfkXWNG

literal 0
Hc$@<O00001

diff --git a/include/.htaccess b/include/.htaccess
new file mode 100644
index 0000000..7a4aa68
--- /dev/null
+++ b/include/.htaccess
@@ -0,0 +1,4 @@
+<Files *.php>
+	Order Deny,Allow
+	Deny from all
+</Files>
\ No newline at end of file
diff --git a/include/admin.inc.php b/include/admin.inc.php
new file mode 100644
index 0000000..75b666a
--- /dev/null
+++ b/include/admin.inc.php
@@ -0,0 +1,148 @@
+<?php
+
+/* Megatokyo Website Administration */
+
+require_once('../LocalSettings.php');
+
+// Core lib
+require_once('html.php');
+require_once('mysql.php');
+require_once('cookies.php');
+require_once('functions.php');
+require_once('error.php');
+
+require_once('uploads.php');
+require_once('nonce.php');
+
+// Objects
+require_once('rants.php');
+require_once('user.php');
+require_once('strip.php');
+require_once('transcript.php');
+require_once('type.php');
+require_once('pages.php');
+require_once('extra.php');
+require_once('twitter.php');
+require_once('tumblr.php');
+require_once('images.php');
+require_once('rss.php');
+
+require_once('twitteroauth/twitteroauth.php');
+
+$mtdb = new MysqlStore();
+$mtdb->connect( DB_SERVER, DB_WRITE_USER, DB_WRITE_PASS, DB_NAME );
+
+/* TODO: Move these definitions to LocalSettings.php */
+if ( !defined('RANTIMG') )
+	define('RANTIMG', '../rantimgs/');
+
+define('USING_TIDY', false);
+
+
+
+/* These function are all for core authentication. */
+
+// Call mysql to hash a password
+function mt_hash_password($password) {
+	global $mtdb;
+	return $mtdb->getOne('SELECT SHA1("' . mysql_real_escape_string($password) . '")') ;
+}
+
+// Remove invalid characters from username. Permit only alpha, underscore, period, at, hypen
+function sanitize_username( $username ) {
+	return preg_replace('|[^a-z_.@-]|i', '', $username);
+}
+
+// Attempt to login with a username and password. If from cookies, set already_hashed = true.
+function mt_login($username, $password, $already_hashed = false) {
+	global $error,$mtdb;
+
+	if ( '' == $username )
+		return false;
+
+	if ( '' == $password ) {
+		$error = ('<strong>ERROR</strong>: The password field is empty.');
+		return false;
+	}
+
+	$username = sanitize_username( $username );
+
+	$login = $mtdb->getRow( 'SELECT id,name,email,nameplate,default_image,default_link,password FROM contributor WHERE name = "' . mysql_real_escape_string($username) . '"');
+	if (!$login) {
+		$error = ('<strong>ERROR</strong>: Invalid username or password.');
+		adminlog("Failed login attempt from ".$_SERVER['REMOTE_ADDR']." for $username.", MTS_LOGIN, MTA_CHANGE);
+		//logthis ('AUTH: Failed login attempt from ' . $_SERVER["REMOTE_ADDR"], var_export( $_SERVER, true ) );
+		return false;
+	} else {
+		// If the password is already_md5, it has been double hashed.
+		// Otherwise, it is plain text.
+		if ( $already_hashed && $username == $login->name && $login->password == $password) {
+			global $currentuser;
+			$currentuser=$login;
+			return true;
+		}
+
+		if (!$already_hashed) {
+			$passhash = mt_hash_password($password);
+			if( $username == $login->name && $passhash == $login->password ) {
+				global $currentuser;
+				$currentuser=$login;
+				return true;
+			}
+		}
+		$error = ('<strong>ERROR</strong>: Invalid username or password.');
+		adminlog("Failed login attempt from ".$_SERVER['REMOTE_ADDR']." for $username.", MTS_LOGIN, MTA_CHANGE);
+		//logthis ('AUTH: Failed login attempt from ' . $_SERVER["REMOTE_ADDR"], var_export( $_SERVER, true ) );
+		return false;
+	}
+}
+
+// Attempt to login using cookies with failback to HTTP Basic Auth.  If that fails, return a 401 to the browser.
+function auth_basic() {
+	if ( !empty($_COOKIE[USER_COOKIE]) && mt_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) )
+		return;
+
+	// Either there is no cookie or the cookie is not valid
+	if (!isset($_SERVER['PHP_AUTH_USER']) || !mt_login($_SERVER['PHP_AUTH_USER'], $_SERVER['PHP_AUTH_PW']) ) {
+		header('WWW-Authenticate: Basic realm="My Realm"');
+		header('HTTP/1.0 401 Unauthorized');
+		die('You do not have permission to view this page.');
+	}
+}
+
+// Attempt to login using cookies. If that fails, redirect to login.php to get credentials.
+function auth_redirect($showloginui=true) {
+	// Checks if a user is logged in, if not redirects them to the login page
+	if ( (!empty($_COOKIE[USER_COOKIE]) &&
+				!mt_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true)) ||
+			 (empty($_COOKIE[USER_COOKIE])) ) {
+		nocache_headers();
+
+		if($showloginui) _redirect( ADMIN_PATH . '/login.php?redirect_to=' . urlencode($_SERVER['REQUEST_URI']));
+		die('You do not have permission to view this page.');
+	}
+}
+
+// Safe redirect, defaults to Temporary
+function _redirect($location, $status = 302) {
+	$location = preg_replace('|[^a-z0-9-~+_.?#=&;,/:%]|i', '', $location);
+	$strip = array('%0d', '%0a');
+	$location = str_replace($strip, '', $location);
+
+	if ( substr(php_sapi_name(), 0, 3) != 'cgi' )
+		header('Status: '.$status); // This causes problems on IIS and some FastCGI setups
+	
+	header("Location: $location");
+	die();
+}
+
+// When doing redirect to login form, ensure headers are never cached.
+function nocache_headers() {
+	@ header('Expires: Wed, 11 Jan 1984 05:00:00 GMT');
+	@ header('Last-Modified: ' . gmdate('D, d M Y H:i:s') . ' GMT');
+	@ header('Cache-Control: no-cache, must-revalidate, max-age=0');
+	@ header('Pragma: no-cache');
+}
+
+
+?>
diff --git a/include/cookies.php b/include/cookies.php
new file mode 100644
index 0000000..096cc37
--- /dev/null
+++ b/include/cookies.php
@@ -0,0 +1,52 @@
+<?php
+
+/* Functions to read, write, compute cookies */
+
+
+if( !defined('COOKIEHASH') )
+	define('COOKIEHASH', md5('megatokyo') );  // Generate a slightly more obscure cookie name
+if ( !defined('USER_COOKIE') )
+	define('USER_COOKIE', 'megatokyoadmin_user_'. COOKIEHASH);
+if ( !defined('PASS_COOKIE') )
+	define('PASS_COOKIE', 'megatokyoadmin_pass_'. COOKIEHASH);
+	
+if ( !defined('COOKIEPATH') )
+	define('COOKIEPATH', ADMIN_PATH . '/' );
+if ( !defined('COOKIE_DOMAIN') )
+	define('COOKIE_DOMAIN', false);
+
+// Get the username and password stored in the cookie
+function mt_get_cookie_login() {
+	if ( empty($_COOKIE[USER_COOKIE]) || empty($_COOKIE[PASS_COOKIE]) )
+		return false;
+
+	return array('login' => $_COOKIE[USER_COOKIE],	'password' => $_COOKIE[PASS_COOKIE]);
+}
+
+// Store username and password in a cookie
+function mt_setcookie($username, $password, $already_md5 = false, $siteurl = '', $remember = false) {
+	global $mtdb;
+	if ( !$already_md5 )
+		$password = mt_hash_password($password);
+
+	if ( empty($siteurl) )
+		$cookiepath = COOKIEPATH;
+	else
+		$cookiepath = preg_replace('|https?://[^/]+|i', '', $siteurl . '/' );
+
+	if ( $remember )
+		$expire = time() + 31536000;
+	else
+		$expire = 0;
+
+	setcookie(USER_COOKIE, $username, $expire, $cookiepath );
+	setcookie(PASS_COOKIE, $password, $expire, $cookiepath );
+}
+
+// Force the cookies to expire
+function mt_clearcookie() {
+	setcookie(USER_COOKIE, ' ', time() - 36000, COOKIEPATH );
+	setcookie(PASS_COOKIE, ' ', time() - 36000, COOKIEPATH );
+}
+
+?>
\ No newline at end of file
diff --git a/include/error.php b/include/error.php
new file mode 100644
index 0000000..2dc840e
--- /dev/null
+++ b/include/error.php
@@ -0,0 +1,77 @@
+<?php
+
+define('MTS_LOGIN', 1);		// User login
+define('MTS_USER', 2);		// Changes to user information
+
+define('MTS_PAGE', 3);		// Modifying static pages
+define('MTS_RANT', 4);		// Modifying rants
+define('MTS_SCRATCH', 5);	// Additions to the scratchpad
+define('MTS_STRIP', 6);		// Modifying strips
+define('MTS_TWITTER', 9);	// Modifications to Twitter presets
+define('MTS_TYPE', 7);		// Changes in the type manager
+define('MTS_TYPE_META', 8);	// Changes in the metatype manager
+define('MTS_TUMBLR', 10);
+
+
+
+define('MTA_ADD', 'create');	// Creation action
+define('MTA_INSERT', 'create');	// Creation action
+define('MTA_DELETE', 'delete');	// Deletion action
+define('MTA_REMOVE', 'delete');	// Deletion action
+define('MTA_MODIFY', 'update');	// Modification action
+define('MTA_UPDATE', 'update');	// Modification action
+define('MTA_CHANGE', 'update');	// Modification action
+
+function adminlog($msg, $section, $action, $level=E_USER_NOTICE, $email=false)
+{
+	global $mtdb, $currentuser;
+	
+	$sql = sprintf('INSERT INTO admin_log (contributor, section, action, level, message) VALUES (%s, %d, "%s", %d, "%s")',
+	               (is_numeric($currentuser->id) ? $currentuser->id : "NULL"), $section, mysql_real_escape_string($action), $level, mysql_real_escape_string($msg));
+	$mtdb->query( $sql ) or die($sql."<br>".mysql_error()."<br>\n".var_export(debug_backtrace()));
+
+	// Log all important sorts of messages in the Apache log
+	if( $level & (E_USER_WARNING | E_USER_ERROR) ) {
+		error_log($msg, 0);
+	}
+
+	// Email critical messages and those for which email is requested
+	if($email || E_USER_ERROR == $level || E_ERROR == $level) {
+		// Pretty printing
+		switch($level) {
+			case E_USER_NOTICE:
+			case E_NOTICE:
+				$importance = 'Notice';
+				break;
+			case E_USER_WARNING:
+			case E_WARNING:
+				$importance = 'Warning';
+				break;
+			case E_USER_ERROR:
+			case E_ERROR:
+				$importance = 'Error';
+				break;
+			default:
+				$importance = "Other - $level";
+				break;
+		}
+
+		switch($section) {
+			case MTS_LOGIN:		$area = 'User login'; break;
+			case MTS_USER:		$area = 'Modify user'; break;
+			case MTS_PAGE:		$area = 'Modify page'; break;
+			case MTS_RANT:		$area = 'Modify rant'; break;
+			case MTS_SCRATCH:	$area = 'Modify scratchpd'; break;
+			case MTS_STRIP:		$area = 'Modify strips'; break;
+			case MTS_TYPE:		$area = 'Modify strip types'; break;
+			case MTS_TYPE_META:	$area = 'Modify strip metatypes'; break;
+			case MTS_TWITTER:	$area = 'Modify Twitter'; break;
+			default:
+				$area = 'Undefined Area'; break;
+		}
+
+		error_log("Megatokyo Administrative Notice\r\nPriority level: $importance\r\nReported by: ".$currentuser->name."\r\nSection: $area\r\n$msg", 1, SITE_CONTACT);
+	}
+}
+
+?>
diff --git a/include/extra.php b/include/extra.php
new file mode 100644
index 0000000..0eeddef
--- /dev/null
+++ b/include/extra.php
@@ -0,0 +1,82 @@
+<?php
+
+/* This library of functions helps the /extra file mananger */
+
+function extra_delete_file($inode) {
+	$file = extra_file_from_inode($inode);
+	return unlink($file->fullpath);
+}
+
+function extra_sort_file_objects($a, $b) {
+	$an = strtolower($a->name);
+	$bn = strtolower($b->name);
+	if( $an == $bn ) return 0;
+	return ( $an < $bn ) ? -1 : 1;
+}
+
+function extra_handle_upload() {
+	global $info,$error,$dir;
+	
+	if( !$_FILES['extra_file'] ) return false;
+	
+	if( '' == $_FILES['extra_file']['name'] ) return false;
+	if( UPLOAD_ERR_NO_FILE == $_FILES['extra_file']['error'] ) return false;
+	if( 0 == $_FILES['extra_file']['size'] ) return false;
+
+	$dest = $_FILES['extra_file']['name'];
+
+	if(isset( $_POST['name'] )) $dest = $_POST['name'];
+	$dest = extra_sanitize_filename($dest);
+	
+	if( !is_uploaded_file( $_FILES['extra_file']['tmp_name'] )) return false;
+	if( move_uploaded_file($_FILES['extra_file']['tmp_name'], $dir.'/'.$dest) ) return $true;
+	
+	return false;
+}
+
+function extra_file_from_inode($inode) {
+	global $dir;
+	$files = extra_get_directory_list($dir);
+	foreach($files as $f) {
+		if( $f->inode == $inode ) return $f;
+	}
+	return false;
+}
+
+function extra_sanitize_filename( $raw_filename ) {
+	$filename = str_replace('/', '');
+	if( $filename !== $raw_filename) return false;
+}
+
+function extra_get_directory_list($dir) {
+	if( !is_dir( $dir ) ) return false;
+	if( ! $handle = opendir( $dir ) ) return false;
+	
+	$files = array();
+	
+	class ExtraFile {
+		var $name;
+		var $rwx;
+		var $mtime;
+		var $inode;
+		
+		function ExtraFile($path, $file) {
+			$this->name = $file;
+			$this->fullpath = $path . $file;
+			$this->rwx = is_readable($this->fullpath) ? 'r' : '-';
+			$this->rwx.= is_writable($this->fullpath) ? 'w' : '-';
+			$this->rwx.= is_executable($this->fullpath) ? 'x' : '-';
+			$this->mtime = filemtime($this->fullpath);
+			$this->inode = fileinode($this->fullpath);
+		}
+		
+	}
+	
+	while (false !== ($file = readdir($handle))) {
+		if( is_file( $dir.'/'.$file )) $files[] = new ExtraFile($dir.'/', $file);
+	}
+
+	return $files;	
+}
+
+?>
\ No newline at end of file
diff --git a/include/functions.php b/include/functions.php
new file mode 100644
index 0000000..2987b56
--- /dev/null
+++ b/include/functions.php
@@ -0,0 +1,91 @@
+<?php
+
+/* Generic string processors */
+
+if(!function_exists('http_build_query')) {
+	function http_build_query( $formdata, $numeric_prefix = null, $key = null ) {
+		$res = array();
+		foreach ((array)$formdata as $k=>$v) {
+			$tmp_key = urlencode(is_int($k) ? $numeric_prefix.$k : $k);
+			if ($key) $tmp_key = $key.'['.$tmp_key.']';
+			$res[] = ( ( is_array($v) || is_object($v) ) ? http_build_query($v, null, $tmp_key) : $tmp_key."=".urlencode($v) );
+		}
+		$separator = ini_get('arg_separator.output');
+		return implode($separator, $res);
+	}
+}
+
+function wp_get_referer() {
+	if ( !empty( $_SERVER['HTTP_REFERER'] ) ) return $_SERVER['HTTP_REFERER'];
+	return false;
+}
+
+function clean_url( $url, $protocols = null ) {
+	if ('' == $url) return $url;
+	$url = preg_replace('|[^a-z0-9-~+_.?#=!&;,/:%]|i', '', $url);
+	$strip = array('%0d', '%0a');
+	$url = str_replace($strip, '', $url);
+	if ( strpos($url, '://') === false && substr( $url, 0, 1 ) != '/' && !preg_match('/^[a-z0-9-]+?\.php/i', $url) )
+		$url = 'http://' . $url;
+	
+	$url = preg_replace('/&([^#])(?![a-z]{2,8};)/', '&#038;$1', $url);
+	return $url;
+}
+
+// Like htmlspecialchars except don't double-encode HTML entities
+function mt_specialchars( $text, $quotes = false ) {
+	
+	$text = str_replace('&&', '&#038;&', $text);
+	$text = str_replace('&&', '&#038;&', $text);
+	$text = preg_replace('/&(?:$|([^#])(?![a-z1-4]{1,8};))/', '&#038;$1', $text);
+	$text = str_replace('<', '&lt;', $text);
+	$text = str_replace('>', '&gt;', $text);
+/*	if ( 'double' === $quotes ) {
+		$text = str_replace('"', '&quot;', $text);
+	} elseif ( 'single' === $quotes ) {
+		$text = str_replace("'", '&#039;', $text);
+	} else
+ */
+		if ( $quotes ) {
+		$text = str_replace('"', '&quot;', $text);
+		$text = str_replace("'", '&#039;', $text);
+	}
+	return $text;
+}
+
+function add_query_arg($param,$value,$url) {
+	return $url . ( (strpos( $url, '?' )===false)  ? '?' : '&' ) . $param . '=' . urlencode($value);
+}
+
+function Excerpt( $excerpt, $maxlen = 455) {
+	$excerpt = strip_tags( $excerpt );
+	if (strlen($excerpt) > $maxlen) {
+		$excerpt = substr($excerpt,0,$maxlen-3) . '...';
+	}
+	return $excerpt;
+}
+
+/* Type names may consist of digits, letters, -, ', :, and whitespace */
+function sanitize_type_name( $name ) {
+	return preg_replace( '/[^\d\w\':\s-]+/', '', $name );
+}
+
+function check_type_name( $name ) {
+	global $error;
+	
+	if( $name == '' )
+		$error.='A type must be supplied with a name, but none was given. Valid characters include letters, numbers, apostrophes, colons, and whitespace.';
+	elseif ( $name !== sanitize_type_name($name) )
+		$error.='Supplied name contains invalid characters. Valid characters include letters, numbers, apostrophes, colons, and whitespace.';
+	else
+		return true;
+	return false;
+}
+
+function _objectInArrayWithIdExists( $id, $arrobj ) {
+	foreach( $arrobj as $v )
+		if( $v->id == $id ) return true;
+	return false;
+}
+
+?>
\ No newline at end of file
diff --git a/include/html.php b/include/html.php
new file mode 100644
index 0000000..6beb760
--- /dev/null
+++ b/include/html.php
@@ -0,0 +1,247 @@
+<?php
+
+// Capture error and info messages in these variables, rendered in adminmenu() as a box below the menu bar.
+$error='';
+$info='';
+
+// write from doctype, html, head, body
+function adminhead($title = '') {
+	?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>Megatokyo Administrative Dashboard<?php if( $title ) echo " &#8212; $title"; ?></title>
+<link rel="stylesheet" href="<?php echo ADMIN_PATH; ?>/wp-admin.css" type="text/css" />
+<link type="application/rss+xml" rel="alternate" title="Admin Log" href="<?php printf('%s%s/%s/adminlog.xml', SITE_HOST, SITE_PATH, SITE_ADMIN) ?>" />
+<link type="application/rss+xml" rel="alternate" title="Scratchpad" href="<?php printf('%s%s/%s/scratchpad.xml', SITE_HOST, SITE_PATH, SITE_ADMIN) ?>" />
+</head>
+<body>
+	<?php
+}
+
+// structure of the top level menubar
+//'manage-statusbox.php' => 'Update Statusbox',
+$menus = array(
+	'index.php' => 'Dashboard',
+	'post-comic.php?next=yes' => 'Post Next Comic',
+	'post-comic.php' => 'Post Comic',
+	'post-rant.php' => 'Write Rant',
+	'post-twitter.php' => 'Update Feeds',
+	'post-page.php' => 'Add page',
+	'manage-comics.php' => 'Manage',
+	'users.php' => 'Users'
+	);
+
+// structure of the second level menubar
+$submenu['manage-comics.php'] = array(
+	'manage-comics.php' => 'Comics',
+	'manage-rants.php' => 'Rants' ,
+	'manage-pages.php' => 'Pages',
+	'manage-types.php' => 'Types',
+	'manage-twitter-users.php' => 'Manage Twitter Users',
+	'manage-metatypes.php' => 'Metatypes',
+	'swap-comics.php' => 'Swap Comics',
+	'character-twitter.php' => 'Character Twitters',
+	'view-adminlog.php' => 'View Admin Log'
+	);
+
+function adminmenu($current='') {
+	global $menus, $submenu, $error, $info;
+
+	if( $current ) {
+		$curS = $curT = $current;
+	} else {
+		$curS = $curT = basename( $_SERVER["PHP_SELF"] );
+	}
+	
+	
+	foreach( $submenu as $l=>$L ) {
+		foreach( $L as $k=>$v ) {
+			if( $k == $curS ) {
+				$curT = $l;
+			}
+		}
+	}
+	$current_sub_menu = false;
+
+	?>		
+	<div id="wphead">
+	<h1>Megatokyo Site Administration <span>(<a href="<?php echo SITE_HOST . SITE_PATH; ?>">View site &raquo;</a>)</span></h1>
+	</div>
+	<div id="user_info"><p>Howdy, <strong><?php getCurrentUser(); ?></strong>. [<a href="<?php echo ADMIN_PATH; 
+		?>/login.php?action=logout" title="Log out of this account">Sign Out</a>] </p></div>
+
+
+	<ul id="adminmenu">
+	<?php
+	foreach ( $menus as $url=>$desc ) {
+		printf ( "		<li><a href=\"%s/%s\"%s>%s</a></li>\n", ADMIN_PATH, $url, ( $curT == $url ? ' class="current"' : '' ), htmlentities($desc) );
+		if( $curT == $url && isset($submenu[$url]) ) {
+			$current_sub_menu = $submenu[$url];
+		}
+	}
+	?></ul><?php
+
+	if( $current_sub_menu ) {
+		?><ul id="submenu"><?php
+		foreach( $current_sub_menu as $url => $desc ) {
+			printf ( "		 <li><a href=\"%s/%s\"%s>%s</a></li>\n", ADMIN_PATH, $url, ( $curS == $url ? ' class="current"' : '' ), htmlentities($desc) );
+		}
+		?></ul><?php
+	} else {
+		?><div id="minisub"></div><?php
+	}
+	?>
+
+	<div class="clear"></div>	
+
+	<?php
+	if( $_GET['deleted'] && $_GET['deleted'] == 'success' ) $info.='<p>Deleted successfully.</p>';
+	if( $_GET['saved'] && $_GET['saved'] == 'success' ) $info.='<p>Changes saved successfully.</p>';
+
+	if( $error ) echo "<div class=\"error fade\">$error</div>";
+	if( $info ) echo "<div class=\"updated fade\">$info</div>";
+	?>
+	<div class="wrap">
+	<?php	
+}
+
+function adminfooter($copy = true) {
+	?>
+	</div>
+	<?php if( $copy ) { ?>
+		<div id="footer">
+		<p class="logo">Style based on <a href="http://wordpress.org/">Wordpress</a>. Powered by Taiyaki.</p>
+		</div>
+	<?php } ?>
+	</body>
+	</html>
+	<?php
+}
+
+function pagination( $page, $total ) {
+	?><p class="pagenav"><?php
+	if( 1 < $page ) {
+	 ?><a class="prev" href="?page=<?php echo $page-1; ?>">&laquo; Previous Page</a> <?php
+	}
+	for( $page_num = 1; $page_num <= $total; $page_num++ ) {
+	 if ( $page == $page_num ) {
+		echo "<span>$page_num</span>";
+	 } else {
+		if ( $page_num < 4 || ( $page_num >= $page - 3 && $page_num <= $page + 3 ) || $page_num > $total - 3 ) {
+			?><a class="page-numbers" href="?page=<?php echo $page_num; ?>"><?php echo $page_num; ?></a><?php
+			$in=true;
+		} elseif( $in==true ) {
+			echo ' ... ';
+			$in=false;
+		}
+	 }
+	}
+	if( $page < $total ) {
+	 ?> <a class="next" href="?page=<?php echo $page+1; ?>">Next Page &raquo;</a><?php
+	}
+	?></p><?php
+}
+
+set_error_handler('handle_error');
+
+function handle_error($errno, $errstr, $errfile, $errline, $errcontext) {
+	switch ($errno)	{
+		case E_USER_WARNING:
+		case E_USER_NOTICE:
+		case E_WARNING:
+		case E_NOTICE:
+		case E_CORE_WARNING:
+		case E_COMPILE_WARNING:
+			break;
+		case E_USER_ERROR:
+		case E_ERROR:
+		case E_PARSE:
+		case E_CORE_ERROR:
+		case E_COMPILE_ERROR:
+
+			header('Content-Type: text/html; charset=utf-8');
+
+			if (eregi('^(sql)$', $errstr)) {
+				$errstr = "SQL Error " . mysql_errno() . ': ' . mysql_error();
+			}
+
+			$message = "Error#$errno: $errstr";
+			//logthis( $message, "in $errfile at line $errline" );
+			mtdie( $message, 'Critical Site Error' );
+		}
+}
+
+function logthis($str,$extra='') {
+	error_log( $str, 0 );
+	if( $extra ) error_log( "Megatokyo Site Error\r\n$str\r\n$extra", 1, SITE_CONTACT );
+}
+
+function mtdie($message,$title='') {
+	header('Content-Type: text/html; charset=utf-8');
+
+	?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<title><?php echo $title?$title:'Megatokyo Administration Editor'; ?></title>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+	<style media="screen" type="text/css">
+		html {
+			background: #eee;
+		}
+		body {
+			background: #fff;
+			color: #000;
+			font-family: Georgia, "Times New Roman", Times, serif;
+			margin-left: 25%;
+			margin-right: 25%;
+			padding: .2em 2em;
+		}
+		h1 {
+			color: #006;
+			font-dize: 18px;
+			font-weight: lighter;
+		}
+				h2 {
+			font-size: 16px;
+		}
+		p, li, dt {
+			line-height: 140%;
+			padding-bottom: 2px;
+		}
+		ul, ol {
+			padding: 5px 5px 5px 20px;
+		}
+		#logo {
+			margin-bottom: 2em;
+		}
+		-->
+	</style>
+</head>
+<body>
+	<h1 id="Logo">Megatokyo Admin</h1>
+		<?php if($title) echo "<h2>$title</h2>\n"; ?>
+	<p><?php echo $message; ?></p>
+</body>
+</html>
+<?php
+	die();
+
+}
+
+function numeric_entities($string){
+    $mapping = array();
+    foreach (get_html_translation_table(HTML_ENTITIES, ENT_QUOTES) as $char => $entity){
+        $mapping[$entity] = '&#' . ord($char) . ';';
+    }
+    return str_replace(array_keys($mapping), $mapping, $string);
+}
+
+function utfentities($string)
+{
+	return htmlentities($string, ENT_COMPAT, 'UTF-8');
+}
+
+?>
diff --git a/include/images.php b/include/images.php
new file mode 100644
index 0000000..a1c41a0
--- /dev/null
+++ b/include/images.php
@@ -0,0 +1,57 @@
+<?php
+
+function getimagefromfile($filename)
+{
+	$img_data = getimagesize($filename);
+	$ext = image_type_to_extension($img_data[2]);
+	
+	switch($ext)
+	{
+		case '.gif':
+			return imagecreatefromgif($filename);
+			break;
+		case '.jpg':
+		case '.jpeg':
+			return imagecreatefromjpeg($filename);
+			break;
+		case '.png':
+			return imagecreatefrompng($filename);
+			break;
+		default:
+			return false;
+	}
+}
+
+function crop_resize($filename, $dest_file)
+{
+	#REQUIRES:	image be at least 300x245
+	$source = getimagefromfile($filename);
+	if(!$source)
+	{
+		return false;
+	}
+	$dest = imagecreatetruecolor(300, 245);
+	
+	#attempt to determine scaling factor
+	$data = getimagesize($filename);
+	#300x245 reduces to 60x49
+	$factor = min(floor($data[0]/60), floor($data[1]/49));
+	#well, that should give us a good scaling factor
+	
+	#now we have to determine what point to start from
+	$src_x = floor(($data[0]/2) - ($factor*30));
+	$src_y = floor(($data[1]/2) - ($factor*24.5));
+	
+	#make sure we don't fuck things up
+	if($src_x < 0) $src_x=0;
+	if($src_y < 0) $src_y=0;
+	
+	#now resample
+	imagecopyresampled($dest, $source, 0, 0, $src_x, $src_y, 300, 245, $factor*60, $factor*49);
+	#and output
+	imagepng($dest, $dest_file);
+
+	return true;
+}
+
+?>
diff --git a/include/mysql.php b/include/mysql.php
new file mode 100644
index 0000000..7ba7036
--- /dev/null
+++ b/include/mysql.php
@@ -0,0 +1,51 @@
+<?php
+
+
+class MysqlStore {
+	var $link;
+	function connect($server,$user,$pass,$dbname) {
+		$this->link = @mysql_connect($server, $user, $pass)
+			or mtdie('Could not connect to the database server.');
+		@mysql_select_db($dbname, $this->link)
+			or mtdie('Could not open the megatokyo database.');
+		if( !$this->link ) mtdie('Could not connect to the database server.');		
+	}
+
+	
+	function query($sql, $showerror = true ) {
+		$r = mysql_query( $sql, $this->link );
+		if( false === $r && $showerror ) echo mysql_error();
+		return $r;
+	}
+	
+	function getAll($sql) {
+		if( $r = $this->query( $sql ) ) {
+			$ret = array();
+			while( $row = mysql_fetch_object( $r ) ) {
+				$ret[] = $row;
+			}
+			return $ret;
+		}
+	}
+	
+	function getRow($sql) {
+		if( $r = $this->query( $sql ) ) {
+			if( false === $r ) {
+				echo mysql_error();
+				return false;
+			}
+			if( mysql_num_rows( $r ) == 0 ) return false;
+			return mysql_fetch_object( $r );
+		}
+	}
+	
+	function getOne($sql) {
+		if( $r = $this->query( $sql ) ) {
+			if( mysql_num_rows( $r ) == 0 ) return false;
+			$ret = mysql_fetch_row( $r );
+			return $ret[0];
+		}
+	}
+}
+
+?>
\ No newline at end of file
diff --git a/include/nonce.php b/include/nonce.php
new file mode 100644
index 0000000..6417760
--- /dev/null
+++ b/include/nonce.php
@@ -0,0 +1,134 @@
+<?php
+
+
+function check_nonce($action) {
+	if( !verify_nonce($_REQUEST['_mtnonce'], $action) ) {
+		wp_nonce_ays($action);
+	}
+}
+
+/*
+ Use nonce lifetime of 20 minutes.
+ 2 time slices, 10 minutes long each.
+ Older nonces will trigger AYS
+ */
+
+if ( !function_exists('verify_nonce') ) :
+function verify_nonce($nonce, $action = -1) {
+		global $currentuser;
+        $uid = (int) $currentuser->id;
+
+        $i = ceil(time() / 600);
+
+        //Allow for expanding range, but only do one check if we can
+        if( substr( md5($i . '|' . $action . $uid), -12, 10) == $nonce || substr( md5(($i - 1) . '|' . $action . $uid), -12, 10) == $nonce )
+                return true;
+        return false;
+}
+endif;
+
+if ( !function_exists('create_nonce') ) :
+function create_nonce($action = -1) {
+		global $currentuser;
+        $uid = (int) $currentuser->id;
+
+        $i = ceil(time() / 600);
+
+        return substr( md5($i . '|' . $action . $uid), -12, 10);
+}
+endif;
+
+
+function wp_nonce_ays($action) {
+	if ( preg_match('#([^/]+\.php)$#', $_SERVER["PHP_SELF"], $self_matches) ) {
+		$pagenow = $self_matches[1];
+	} elseif ( strpos($_SERVER["PHP_SELF"], '?') !== false ) {
+		$pagenow = explode('/', $_SERVER["PHP_SELF"]);
+		$pagenow = trim($pagenow[(sizeof($pagenow)-1)]);
+		$pagenow = explode('?', $pagenow);
+		$pagenow = $pagenow[0];
+	} else {
+		$pagenow = 'index.php';
+	}
+
+	$adminurl = clean_url(wp_get_referer());
+
+		$html='The attempted operation is potentially unsafe.</p>';
+
+		if ( $_POST ) {
+			$q = http_build_query($_POST);
+			$q = explode( ini_get('arg_separator.output'), $q);
+			$html .= "\t<form method='post' action='" . htmlentities($pagenow) . "'>\n";
+			foreach ( (array) $q as $a ) {
+				$v = substr(strstr($a, '='), 1);
+				$k = substr($a, 0, -(strlen($v)+1));
+				$html .= "\t\t<input type='hidden' name='" . mt_specialchars(urldecode($k),true) . "' value='" . mt_specialchars(urldecode($v),true) . "' />\n";
+			}
+			$html .= "\t\t<input type='hidden' name='_mtnonce' value='" . create_nonce($action) . "' />\n";
+			$html .= "\t\t<div id='message' class='confirm fade'>\n\t\t<p>" . mt_explain_nonce($action) . "</p>\n\t\t<p><a href='$adminurl'>No</a> &nbsp; <input type='submit' value='Yes' /></p>\n\t\t</div>\n\t</form><p>\n";
+		} else {
+		$html .= "\t<div id='message' class='confirm fade'>\n\t<p>" . mt_explain_nonce($action) . "</p>\n\t<p><a href='$adminurl'>No</a> &nbsp; <a href='" . clean_url(add_query_arg( '_mtnonce', create_nonce($action), $_SERVER['REQUEST_URI'] )) . "'>Yes</a></p>\n\t</div><p>\n";
+	}
+	mtdie($html, 'Are You Sure?');
+}
+
+function mt_explain_nonce($action) {
+	global $mtdb;
+	$c = explode('-',$action);
+	$i = (int)$c[2];
+	
+	$message = array();
+	$message['rant']['new'] = 'Are you sure you want to create a new rant?';
+	$message['rant']['save'] = 'Are you sure you want to save changes to the rant "%s"?';
+	$message['rant']['delete'] = 'Are you sure you want to delete the rant "%s"? This is a destructive action, and cannot be undone!';
+		
+	$message['type']['new'] = 'Are you sure you want to create a new type?';
+	$message['type']['save'] = 'Are you sure you want to save changes to the type "%s"?';
+	$message['type']['delete'] = 'Are you sure you want to delete the type "%s"? This is a destructive action, and cannot be undone!';
+	
+	$message['metatype']['new'] = 'Are you sure you want to create a new metatype?';
+	$message['metatype']['save'] = 'Are you sure you want to save changes to the metatype "%s"?';
+	$message['metatype']['delete'] = 'Are you sure you want to delete the metatype "%s"? This is a destructive action, and cannot be undone!';
+
+	$message['strip']['new'] = 'Are you sure you want to create a new strip?';
+	$message['strip']['save'] = 'Are you sure you want to save changes to the strip "%s"?';
+	$message['strip']['delete'] = 'Are you sure you want to delete the comic strip "%1$s"? This will break site navigation, which can be fixed by changing other strip numbers. This is a destructive action, and cannot be undone! It is far better to <a href="edit-comic.php?strip_id=%1$s">edit the existing strip</a>.';
+	$message['strip']['swap'] = 'Are you sure you want to swap these two strips? This is a destructive action, and cannot be undone!';
+	
+	$message['statusbox']['update'] = 'Are you sure you want to update the statusbox information?';
+	$message['scratchpad']['new'] = 'Are you sure you want to update the scratchpad information?';
+	$message['twitter']['new'] = 'Are you sure you want to update the Twitter feed?';
+	
+	$message['extra']['new'] = 'Are you sure you want to upload a new file to /extra?';
+	$message['extra']['delete'] = 'Are you sure you want to delete the file from /extra named "%s"?';
+	
+	$message['twitteruser']['delete'] = 'Are you sure you want to delete the twitter user "%s"?';
+	
+	if( isset( $message[ $c[1] ][ $c[0] ] )) {
+		$t = $message[ $c[1] ][ $c[0] ];
+		
+		if( false !== strpos( $t, '%' ) ) {
+			
+			switch( $c[1] ) {
+				case 'rant':	$v = $mtdb->getOne('SELECT title FROM rant WHERE id=' . $i); break;
+				case 'strip':	$v = $mtdb->getOne('SELECT id FROM strip WHERE id=' . $i); break;
+				case 'type':	$v = $mtdb->getOne('SELECT name FROM strip_t WHERE id=' . $i); break;
+				case 'metatype':$v = $mtdb->getOne('SELECT name FROM meta_t WHERE id=' . $i); break;
+				case 'extra':   $temp = extra_file_from_inode($i); $v = $temp->name; break;
+				case 'twitteruser': $v = $mtdb->getOne('SELECT username FROM twitter_user WHERE id=' . $i); break;
+				default:		$v = $i;
+			}
+			
+			return sprintf( $t, mt_specialchars($v,true) );
+		}
+
+		return $t;		
+	}
+	return "Are you sure you want to perform the action $action?";
+}
+
+function nonce_field($action) {
+	echo '<input type="hidden" name="_mtnonce" value="' . create_nonce($action) . '" />';
+}
+
+?>
\ No newline at end of file
diff --git a/include/pages.php b/include/pages.php
new file mode 100644
index 0000000..2ebda84
--- /dev/null
+++ b/include/pages.php
@@ -0,0 +1,53 @@
+<?php
+
+class Page {
+	var $url_name, $status, $title, $body, $style;
+}
+
+function savepage($page) {
+	if($page->url_name)
+		return updatepage($page);
+	else
+		return insertpage($page);
+}
+
+function insertpage($page) {
+	global $mtdb;
+	$sql = 'INSERT INTO static_page ( url_name, status, title, body, style ) VALUES ('
+		. '   "' . mysql_real_escape_string($page->url_name)
+		. '", "' . mysql_real_escape_string($page->status)
+		. '", "' . mysql_real_escape_string( trim( $page->title ) )
+		. '", "' . mysql_real_escape_string( trim( $page->body ) )
+		. '", "' . mysql_real_escape_string( trim( $page->style ) )
+		. '")';
+	adminlog("Page '".$page->url_name."' has been added.", MTS_PAGE, MTA_ADD);
+	return $mtdb->query($sql);
+}	
+
+function updatepage($page) {
+	if ( !$page->url_name ) return false;
+	global $mtdb;
+	
+	$sql = 'UPDATE static_page SET url_name = "' . mysql_real_escape_string($page->url_name)
+		. '", status = "' . mysql_real_escape_string($page->status)
+		. '", title = "' . mysql_real_escape_string( trim($page->title) )
+		. '", body = "' . mysql_real_escape_string( trim($page->body ) )
+		. '", style = "' . mysql_real_escape_string( trim($page->style ) )
+		. '" WHERE url_name = "' . mysql_real_escape_string($page->url_name) . '"';
+	adminlog("Page '".$page->url_name."' has been updated.", MTS_PAGE, MTA_MODIFY);
+	return $mtdb->query( $sql );
+}
+
+function deletepage($url_name) {
+	if ( !$url_name ) return false;
+	global $mtdb;
+	adminlog("Page '".$page->url_name."' has been deleted.", MTS_PAGE, MTA_DELETE);
+	return $mtdb->query( 'DELETE FROM static_page WHERE url_name = "' . mysql_real_escape_string($url_name) . '"' );
+}
+
+function getpage($url_name) {
+	global $mtdb;
+	return $mtdb->getRow( 'SELECT url_name, status, title, body, style FROM static_page WHERE url_name = "'. mysql_real_escape_string($url_name) . '"' );
+}
+
+?>
diff --git a/include/rants.js b/include/rants.js
new file mode 100644
index 0000000..8ea1e08
--- /dev/null
+++ b/include/rants.js
@@ -0,0 +1,9 @@
+function new_rant_attachment()
+{
+	var list = document.getElementById('rant_attachment_list');
+
+	var elt = document.createElement('li');
+	elt.innerHTML = '<input type="file" name="rant_attachment[]" />';
+
+	list.appendChild(elt);
+}
diff --git a/include/rants.php b/include/rants.php
new file mode 100644
index 0000000..6dca332
--- /dev/null
+++ b/include/rants.php
@@ -0,0 +1,119 @@
+<?php
+
+class Rant {
+	var $id, $published, $status, $side, $author, $title, $body, $link, $imagetype, $imagetext;
+}
+
+function saverant($rant) {
+	if($rant->id)
+		return updaterant($rant);
+	else
+		return insertrant($rant);
+}
+
+function insertrant($rant) {
+	global $mtdb;
+	$sql = 'INSERT INTO rant ( published, status, side, author, title, body, link, imagetype, imagetext ) VALUES ( FROM_UNIXTIME('
+		. (int)$rant->published
+		. '), "' . mysql_real_escape_string($rant->status)
+		. '", "' . mysql_real_escape_string($rant->side)
+		. '", "' . (int)$rant->author
+		. '", "' . mysql_real_escape_string( trim( $rant->title) )
+		. '", "' . mysql_real_escape_string( trim( $rant->body ) )
+		. '", "' . mysql_real_escape_string( trim( $rant->link ) )
+		. '", ' . mysql_real_escape_string($rant->imagetype)
+		. ', "' . mysql_real_escape_string( trim( $rant->imagetext ) )
+		. '")';
+	
+	if( $mtdb->query( $sql ) ) {
+		//logthis( 'Saved changes to rant ' . $rant->id );
+		$rant->id = mysql_insert_id( $mtdb->link );
+		
+		adminlog("Rant ".$rant->id." saved.", MTS_RANT, MTA_ADD);
+		
+		if($rant->status == "published")
+		{
+			$poster = get_userdatabyid($rant->author);
+			adminlog("Rant ".$rant->id." published.", MTS_RANT, MTA_ADD);
+			twitterpost("New rant posted by ".$poster->name.": ".SITE_HOST.SITE_PATH."/rant/".$rant->id);
+
+			if($rant->author === 1) {
+				tumblrpost($rant->title, $rant->body);
+			}
+		}
+		
+		return $rant->id;
+	}
+	return false;
+}	
+
+function updaterant($rant) {
+	if ( !(int)$rant->id ) return false;
+	global $mtdb;
+	
+	#first, check if it's published already
+	$qr = $mtdb->query("SELECT status FROM rant WHERE id = ".$rant->id);
+	$row = mysql_fetch_row($qr);
+	$status = $row[0];
+	
+	adminlog("Rant ".$rant->id." updated.", MTS_RANT, MTA_UPDATE);
+	
+	$sql = 'UPDATE rant SET published=FROM_UNIXTIME(' . (int)$rant->published
+		. '), status = "' . mysql_real_escape_string($rant->status)
+		. '", side = "' . mysql_real_escape_string($rant->side)
+		. '", author = ' . (int)$rant->author
+		. ', title = "' . mysql_real_escape_string( trim($rant->title) )
+		. '", body = "' . mysql_real_escape_string( trim($rant->body ) )
+		. '", link = "' . mysql_real_escape_string( trim($rant->link ) )
+		. '", imagetype = ' . (int)$rant->imagetype
+		. ', imagetext = "' . mysql_real_escape_string( trim($rant->imagetext) )
+		. '" WHERE id=' . (int)$rant->id;
+	
+	if($status == "draft" && $rant->status == "published")
+	{
+		$poster = get_userdatabyid($rant->author);
+		adminlog("Rant ".$rant->id." published.", MTS_RANT, MTA_UPDATE);
+		twitterpost("New rant posted by ".$poster->name.": ".SITE_HOST.SITE_PATH."/rant/".$rant->id);
+
+		if($rant->author === 1) {
+			tumblrpost($rant->title, $rant->body);
+		}
+	}
+	
+	return $mtdb->query( $sql );
+}
+
+function deleterant($rantid) {
+	if ( !(int)$rantid ) return false;
+	global $mtdb;
+	adminlog("Rant ".$rantid." deleted.", MTS_RANT, MTA_DELETE);
+	return $mtdb->query( 'DELETE FROM rant WHERE id=' . $rantid );
+}
+
+function deleteattachment($id)
+{
+	global $mtdb;
+	$file = SITE_PATH_ABS.'/'.get_rantattachment_filename($id);
+	unlink( $file ) or adminlog("Could not delete $file", MTS_RANT, MTA_DELETE, E_USER_WARNING);
+	$mtdb->query( 'DELETE FROM rant_attachment WHERE id = ' . $id );
+	adminlog("Deleted attachment $id", MTS_RANT, MTA_DELETE);
+}
+
+function getrant($id) {
+	global $mtdb;
+	return $mtdb->getRow( 'SELECT id, UNIX_TIMESTAMP(published) as published, status, side, author, title, body, link, imagetype, imagetext FROM rant WHERE id = '. (int)$id );
+}
+
+function get_rantimage_filename( $rant ) {
+	global $mtdb;
+	$ext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id=' . (int)$rant->imagetype ); // filename extension
+	return sprintf( '%s/%04d.%s',SITE_RANT, (int)$rant->id, $ext );
+}
+
+function get_rantattachment_filename( $id ) {
+	global $mtdb;
+	$ext = $mtdb->getOne( 'SELECT extension FROM media_t JOIN rant_attachment ra ON ra.media = media_t.id WHERE ra.id=' . (int)$id ); // filename extension
+	return sprintf( '%s/%d.%s',SITE_RANT_ATTACHMENT, (int)$id, $ext );
+}
+
+?>
diff --git a/include/rss.php b/include/rss.php
new file mode 100644
index 0000000..8f3e4bd
--- /dev/null
+++ b/include/rss.php
@@ -0,0 +1,14 @@
+<?php
+
+function rsspost($body, $url)
+{
+	global $mtdb;
+	
+	$mtdb->query('INSERT INTO rss_comment (body, url)
+		VALUES ("'.mysql_real_escape_string($body).'",
+		"'.mysql_real_escape_string($url).'")');
+
+	return true;
+}
+
+?>
diff --git a/include/strip.php b/include/strip.php
new file mode 100644
index 0000000..414c3af
--- /dev/null
+++ b/include/strip.php
@@ -0,0 +1,130 @@
+<?php
+
+// Book: The offset from 0 at the beginning of time
+// Page: The offset from 0 at the beginning of the volume
+
+class Strip {
+	var $id, $old_id, $published, $media, $type, $title, $book, $page;
+}
+
+// old_id is used to detect alterations to the strip id in forms. Not saved in database.
+// media is imagetype
+
+// Strip id is automatically incremented
+function insertstrip(&$strip) {
+	global $mtdb;
+	
+	$strip->book = ($strip->book == '') ? 'NULL' : (int)$strip->book;
+	$strip->page = ($strip->page == '') ? 'NULL' : (int)$strip->page;	
+	
+	$mtdb->query('START TRANSACTION');
+	$newid = $mtdb->getOne('SELECT MAX(id) FROM strip') + 1;
+	$sql = 'INSERT INTO strip ( id, published, media, type, title, book, page ) VALUES ('
+		. $newid
+		. ', FROM_UNIXTIME(' . (int)$strip->published
+		. '), '. (int)$strip->media
+		. ', ' . (int)$strip->type
+		. ', "' . mysql_real_escape_string( trim($strip->title) )
+		. '", '. $strip->book
+		. ', ' . $strip->page
+		. ')';
+		
+	$r = $mtdb->query( $sql );
+	if( !$r ) {
+		$mtdb->query('ROLLBACK');
+		return false;
+	}
+	$mtdb->query('COMMIT');
+	adminlog("Comic ".$newid." posted.", MTS_STRIP, MTA_ADD);
+	
+	$strip->id = $newid;
+	if( $strip->id == 0 ) return false;
+	return true;
+}	
+
+function updatestrip(&$strip) {
+	global $mtdb;
+	
+	$strip->book = ($strip->book === '') ? 'NULL' : (int)$strip->book;
+	$strip->page = ($strip->page === '') ? 'NULL' : (int)$strip->page;
+	
+	$mtdb->query('START TRANSACTION');
+	$sql = 'UPDATE strip SET
+		published = FROM_UNIXTIME(' . (int)$strip->published .')
+		, media = '. (int)$strip->media .'
+		, type = ' . (int)$strip->type .'
+		, title = "' . mysql_real_escape_string( trim($strip->title) ) .'"
+		, book = ' . (int)$strip->book .'
+		, page = ' . (int)$strip->page .'
+		WHERE id = ' . (int)$strip->id;
+	$mtdb->query( $sql );
+	$mtdb->query('COMMIT');
+	adminlog("Comic ".$strip->id." modified.", MTS_STRIP, MTA_MODIFY);
+	return true;
+}	
+
+// Delete destination strip from DB and FS, and Update/Rename the source strip into place. Destructive Move!
+function move_strip($from_id, $to_id)
+{
+	global $mtdb;
+	$from_id = (int) $from_id;
+	$to_id = (int) $to_id;
+	
+	// Ensure our source exists
+	$num_strips = $mtdb->getOne( "SELECT COUNT(*) FROM strip WHERE id = $from_id" );
+	if($num_strips < 1)
+		mtdie("Cannot move strip number $from_id, because it cannot be found in database.");
+
+	// Ready the destination
+	deletestrip( $to_id );
+	
+	// Update database
+	$mtdb->query( "UPDATE strip SET id = $to_id WHERE id = $from_id" );
+	$strip = $mtdb->getRow( "SELECT strip.id, extension FROM strip, media_t WHERE media_t.id = strip.media AND strip.id = $to_id" );
+
+	// Update filesystem
+	foreach(glob(sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/%04d.*', $from_id)) as $item) {
+		preg_match('/\.(\w{3})$/', $item, $match) or die("Invalid filename: $item");
+		rename($item, sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/%04d.%s', $to_id, $match[1]));
+	}
+}
+
+// Classic swap function, using strip 0 as temporary storage. Can cause concurrency issues. FLOCK!
+function swap_strips( $from_id, $to_id ) {
+	move_strip($from_id, 0);
+	move_strip($to_id, $from_id);
+	move_strip(0, $from_id );
+	adminlog("Comics ".$from_id." and ".$to_id." swapped.", MTS_STRIP, MTA_MODIFY);
+}
+
+function deletestrip($id) {
+	$id = (int)$id;
+	if ( !$id ) return false;
+		
+	global $mtdb;
+	$r = $mtdb->query( 'DELETE FROM strip WHERE id=' . $id );
+	foreach(glob(sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/%04d*.*', $id)) as $item)
+		unlink($item);
+	foreach(glob(sprintf(SITE_PATH_ABS.'/'.SITE_STRIP.'/restricted/%04d*.*', $id)) as $item)
+		unlink($item);
+	adminlog("Comic ".$id." deleted.", MTS_STRIP, MTA_DELETE);
+	return $r;
+}
+
+function getstrip($id) {
+	global $mtdb;
+	return $mtdb->getRow( 'SELECT id, UNIX_TIMESTAMP(published) as published, type, media, title, book, page FROM strip WHERE id=' . (int)$id);
+}
+
+function get_stripimage_filename( $strip ) {
+	global $mtdb;
+	$ext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id=' . (int)$strip->media ); // filename extension
+	return sprintf( '%s/%04d.%s', SITE_STRIP, $strip->id, $ext );
+}
+
+function get_stripid_by_rantid($rantid) {
+	global $mtdb;
+	return $mtdb->getOne('SELECT MAX(strip.id) FROM strip,rant WHERE strip.published<=rant.published AND rant.id=' . (int)$rantid);
+}
+
+?>
diff --git a/include/transcript.php b/include/transcript.php
new file mode 100644
index 0000000..4493cf7
--- /dev/null
+++ b/include/transcript.php
@@ -0,0 +1,182 @@
+<?php
+//check that angle brackets are balanced
+function bracketbalance($line)
+{
+	#first, if no angle brackets, we're OK
+	if(substr_count($line, "<") == 0 &&  substr_count($line, ">") == 0)
+		return true;
+	
+	if(substr_count($line, "<") != substr_count($line, ">"))
+	{
+		return false;
+	}
+	
+	return true;
+}
+
+// Retrieve transcript for this strip from the database, modifying the strip object.
+function gettranscript(&$strip)
+{
+	global $mtdb;
+	
+	$result = $mtdb->query('SELECT strip FROM transcript WHERE strip=' . (int)$strip->id );
+
+	if($result)
+	{
+		$output = '';
+		/*
+		#this gets me the highest panel number that has a transcript
+		# panels beyond that either lack speech or don't exist
+		# either way, I care not
+		Might be able to exchange this loop of getOne()s for a getAll() call.
+		*/
+		$numPanels = $mtdb->getOne( 'SELECT MAX(panel) FROM transcript WHERE transcript.strip=' . (int)$strip->id );
+		if( $numPanels ) {
+			for($i = 1; $i <= $numPanels; $i++) {
+				$result = $mtdb->query( 'SELECT speaker, speech FROM transcript WHERE transcript.strip=' . (int)$strip->id . ' AND panel=' .$i.' ORDER BY line')
+					or mtdie("There was an error fetching the panel count in the transcript for $strip->id, panel $i. " . mysql_error(), 'SQL Error');
+			
+				if(!$result) continue;
+			
+				$output.= "\nnewpanel\n";
+				while($row = mysql_fetch_row($result)) {
+					if(strlen($row[0]) < 1) continue;
+				
+					$output.= $row[0];
+					if($row[1] !== '') $output.= ":: ".$row[1];
+					$output.= "\n";
+				}
+			}
+		}
+	}
+	$strip->transcript = $output;
+	return $output;
+}
+
+
+// Parse submitted transcript from strip object, and insert it into the database.
+function savetranscript( &$strip ) {
+	global $mtdb;
+	$info = '';
+		
+	$mtdb->query('START TRANSACTION');
+	
+	//remove any old transcript data - it's being replaced
+	$mtdb->query( 'DELETE FROM transcript WHERE transcript.strip=' . (int)$strip->id );
+
+	if( $strip->transcript_posted ) {
+		$inserter = 'INSERT INTO transcript (strip,panel,line,speaker,speech,search) VALUES (%d,%d,%d,"%s","%s","%s")';
+
+		if(strpos($strip->transcript_posted, 'Panel <$n>') !== FALSE) {
+			# This is probably a scrivener script
+
+			$panels = explode('Panel <$n>', $strip->transcript_posted);
+			$panels = array_map('trim', $panels);
+			$numPanels = count($panels);
+
+			for($i = 0; $i < $numPanels; $i++) {
+				$lines = explode("\n", $panels[$i]);
+				$lines = array_map('trim', $lines);
+
+				# Initialize speaker controls
+				$speaker = null;
+				$has_spoken = true;
+
+				for($j = 0; $j < count($lines); $j++) {
+					$insert_sql = '';
+
+					if(strpos($lines[$j], '(') === 0) {
+						# Line is a note, add it as a comment
+						$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, '#', mysql_real_escape_string($lines[$j]), '');
+					} elseif(strpos($lines[$j], '[') === 0 || strlen($lines[$j]) == 0) {
+						# Line is an annotation or blank, do nothing
+						continue;
+					} elseif(strpos($lines[$j], 'nospeaking:') === 0) {
+						# Line contains a list of nonspeaking characters
+						array_splice($lines, $j, 1, array_map('_nospeaker', explode(',', substr($lines[$j], 11))));
+						$speaker = trim(substr($lines[$j], 11));
+						$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, mysql_real_escape_string($speaker), '', '');
+					} elseif($i > 0 && $lines[$j] == strtoupper($lines[$j])) {
+						# Line designates a new speaker, note speaker
+
+						# Handle speakers who did not say anything
+						if(null !== $speaker && !$has_spoken)
+							$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, mysql_real_escape_string($speaker), '', '');
+
+						$speaker = ucfirst(strtolower($lines[$j]));
+						$has_spoken = false;
+					} elseif(null !== $speaker) {
+						# Line is speech, match with speaker and add
+						if(!bracketbalance($lines[$j]))
+							$info .= "<p>Warning: Open brackets do not match close brackets in panel $i for speaker ".htmlentities($speaker).'</p>';
+
+						$search = preg_replace( '/[[:punct:]]|(?<=\s)\s+/', ' ', strtolower($lines[$j]) );
+						$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, mysql_real_escape_string($speaker),
+								mysql_real_escape_string($lines[$j]), mysql_real_escape_string($search));
+						$has_spoken = true;
+					} else {
+						# Line is unrecognized, add it as a comment
+						$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, '#', mysql_real_escape_string($lines[$j]), '');
+					}
+
+					if( $insert_sql && false === $mtdb->query( $insert_sql ) ) {
+						$mtdb->query('ROLLBACK');
+						mtdie (mysql_error(), 'Error inserting transcript.');
+					}
+				}
+
+				if(null !== $speaker && !$has_spoken) {
+					$insert_sql = sprintf($inserter, (int)$strip->id, $i, $j, mysql_real_escape_string($speaker), '', '');
+					if( false === $mtdb->query( $insert_sql ) ) {
+						$mtdb->query('ROLLBACK');
+						mtdie (mysql_error(), 'Error inserting transcript.');
+					}
+				}
+			}
+			
+		} else {
+			# Assume that this is a Kalium style transcript
+
+			$panels = explode('newpanel', $strip->transcript_posted);
+			$numPanels = count($panels);
+			foreach($panels as $currPanel)
+				$currPanel = trim($currPanel);
+			
+			for($i = 1; $i < $numPanels; $i++) {
+				$lines = explode("\n", $panels[$i]);
+				$numLines = count($lines);
+				foreach($lines as $currLine)
+					$currLine = trim($currLine);
+				
+				for($j = 1; $j < $numLines; $j++) {
+					$spoken = explode("::", $lines[$j]); // Distinguish between speaker and speech
+					
+					$spoken[0] = trim($spoken[0]);	// Strip excess whitespace
+					$spoken[1] = trim($spoken[1]);
+					
+					if(strlen($spoken[0]) <  1) continue;	// Disregard null
+					$spoken[2] = preg_replace('/[[:punct:]]|(?<=\s)\s+/', ' ', strtolower($spoken[1]) );	// Make searchable text
+					
+					if(!bracketbalance($spoken[1]))
+						$info .= "<p>Warning: Open brackets do not match close brackets in panel $i for speaker ".htmlentities($spoken[0]).'</p>';
+
+					$insert_sql = sprintf($inserter, (int)$strip->id, (int)$i, (int)$j, mysql_real_escape_string($spoken[0]),
+							mysql_real_escape_string($spoken[1]), mysql_real_escape_string($spoken[2]) );
+					if( false === $mtdb->query( $insert_sql ) ) {
+						$mtdb->query('ROLLBACK');
+						mtdie (mysql_error(), 'Error inserting transcript.');
+					}
+				}
+			}
+		}
+	}
+	$mtdb->query('COMMIT');
+	return $info;
+}
+
+function _nospeaker($name)
+{
+	return "nospeaking: $name";
+}
+
+?>
diff --git a/include/tumblr.php b/include/tumblr.php
new file mode 100644
index 0000000..5f54710
--- /dev/null
+++ b/include/tumblr.php
@@ -0,0 +1,50 @@
+<?php
+
+function tumblrpost($title, $body) {
+	global $error;
+	// Authorization info
+	$tumblr_email    = TUMBLR_USER;
+	$tumblr_password = TUMBLR_PASS;
+
+	// Data for new record
+	$post_type  = 'regular';
+	$post_title = $title;
+	$post_body  = $body;
+
+	// Prepare POST request
+	$request_data = http_build_query(
+	    array(
+	        'email'     => $tumblr_email,
+	        'password'  => $tumblr_password,
+	        'type'      => $post_type,
+	        'title'     => $post_title,
+	        'body'      => $post_body,
+	        'generator' => 'Megatokyo',
+			'format'	=> 'html',
+			'tags'		=> 'rant',
+	    )
+	);
+
+	// Send the POST request (with cURL)
+	$c = curl_init('http://www.tumblr.com/api/write');
+	curl_setopt($c, CURLOPT_POST, true);
+	curl_setopt($c, CURLOPT_POSTFIELDS, $request_data);
+	curl_setopt($c, CURLOPT_RETURNTRANSFER, true);
+	$result = curl_exec($c);
+	$status = curl_getinfo($c, CURLINFO_HTTP_CODE);
+	curl_close($c);
+
+	// Check for success
+	if ($status == 201) {
+	    $info .= "<p>Successfully posted to Tumblr.</p>";
+		adminlog("Post to Tumblr successful. Post id $result", MTS_TUMBLR, MTA_ADD);
+	} else if ($status == 403) {
+	    $error .= '<p>Bad email or password posting to Tumblr.</p>';
+		adminlog('Bad email or password posting to Tumblr.', MTS_TUMBLR, MTA_ADD);
+	} else {
+	    $error .= "<p>There was an error posting to Tumblr.</p>";
+		adminlog("Error posting to Tumblr: $result", MTS_TUMBLR, MTA_ADD);
+	}
+}
+
+?>
diff --git a/include/twitter.php b/include/twitter.php
new file mode 100644
index 0000000..b6816ba
--- /dev/null
+++ b/include/twitter.php
@@ -0,0 +1,63 @@
+<?php
+
+function twitterpost($message, $user=TWITTER_USER, $password=TWITTER_PASS)
+{
+	global $mtdb, $info, $error;
+	if( $user == '' ) {
+		# preserve existing twitterpost(message) style posting until OAuth has been vetted.
+		$user = TWITTER_USER;
+		$curl_handle = curl_init();
+		curl_setopt($curl_handle, CURLOPT_URL, TWITTER_HOST);
+		curl_setopt($curl_handle, CURLOPT_CONNECTTIMEOUT, 2);
+		curl_setopt($curl_handle, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($curl_handle, CURLOPT_POST, 1);
+		curl_setopt($curl_handle, CURLOPT_POSTFIELDS, "status=".urlencode($message));
+		curl_setopt($curl_handle, CURLOPT_USERPWD, urlencode($user).":".urlencode($password));
+
+		$buffer = curl_exec($curl_handle);
+		curl_close($curl_handle);
+
+		if(empty($buffer))
+		{
+			adminlog("Twitter post failed for user $user!", MTS_TWITTER, MTA_ADD);
+		}
+		return !empty($buffer);
+		
+	} else {
+		# OAuth Mode
+		$row = $mtdb->getRow( sprintf('SELECT id, username, oauth_token, oauth_token_secret FROM twitter_user WHERE username="%s"', mysql_real_escape_string($user)));
+		
+		$username = $row->username;
+		$oauth_token = $row->oauth_token;
+		$oauth_token_secret = $row->oauth_token_secret;
+		
+		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $oauth_token, $oauth_token_secret);
+		
+		$parameters = array('status' => $message );
+		$status = $connection->post('statuses/update', $parameters);
+		
+		switch( $connection->http_code ) {
+			case 200:
+				adminlog("Twitter post succeeded for user $username!", MTS_TWITTER, MTA_ADD);
+				return true;
+			default:
+				adminlog("Twitter post failed for user $username!", MTS_TWITTER, MTA_ADD);
+				return false;
+		}
+		
+		
+	}
+	
+
+}
+
+
+function setOAuthTokens($userid,$oauth_token,$oauth_token_secret, $username) {
+	global $mtdb;
+	$id = (int)$userid;
+	if( $mtdb->query( sprintf('UPDATE twitter_user SET oauth_token="%s", oauth_token_secret="%s", username="%s" WHERE id=%d', mysql_real_escape_string($oauth_token), mysql_real_escape_string($oauth_token_secret), mysql_real_escape_string($username), $id )) )
+		return true;
+	return false;
+}
+
+?>
diff --git a/include/twitteroauth/OAuth.php b/include/twitteroauth/OAuth.php
new file mode 100644
index 0000000..67a94c4
--- /dev/null
+++ b/include/twitteroauth/OAuth.php
@@ -0,0 +1,874 @@
+<?php
+// vim: foldmethod=marker
+
+/* Generic exception class
+ */
+class OAuthException extends Exception {
+  // pass
+}
+
+class OAuthConsumer {
+  public $key;
+  public $secret;
+
+  function __construct($key, $secret, $callback_url=NULL) {
+    $this->key = $key;
+    $this->secret = $secret;
+    $this->callback_url = $callback_url;
+  }
+
+  function __toString() {
+    return "OAuthConsumer[key=$this->key,secret=$this->secret]";
+  }
+}
+
+class OAuthToken {
+  // access tokens and request tokens
+  public $key;
+  public $secret;
+
+  /**
+   * key = the token
+   * secret = the token secret
+   */
+  function __construct($key, $secret) {
+    $this->key = $key;
+    $this->secret = $secret;
+  }
+
+  /**
+   * generates the basic string serialization of a token that a server
+   * would respond to request_token and access_token calls with
+   */
+  function to_string() {
+    return "oauth_token=" .
+           OAuthUtil::urlencode_rfc3986($this->key) .
+           "&oauth_token_secret=" .
+           OAuthUtil::urlencode_rfc3986($this->secret);
+  }
+
+  function __toString() {
+    return $this->to_string();
+  }
+}
+
+/**
+ * A class for implementing a Signature Method
+ * See section 9 ("Signing Requests") in the spec
+ */
+abstract class OAuthSignatureMethod {
+  /**
+   * Needs to return the name of the Signature Method (ie HMAC-SHA1)
+   * @return string
+   */
+  abstract public function get_name();
+
+  /**
+   * Build up the signature
+   * NOTE: The output of this function MUST NOT be urlencoded.
+   * the encoding is handled in OAuthRequest when the final
+   * request is serialized
+   * @param OAuthRequest $request
+   * @param OAuthConsumer $consumer
+   * @param OAuthToken $token
+   * @return string
+   */
+  abstract public function build_signature($request, $consumer, $token);
+
+  /**
+   * Verifies that a given signature is correct
+   * @param OAuthRequest $request
+   * @param OAuthConsumer $consumer
+   * @param OAuthToken $token
+   * @param string $signature
+   * @return bool
+   */
+  public function check_signature($request, $consumer, $token, $signature) {
+    $built = $this->build_signature($request, $consumer, $token);
+    return $built == $signature;
+  }
+}
+
+/**
+ * The HMAC-SHA1 signature method uses the HMAC-SHA1 signature algorithm as defined in [RFC2104] 
+ * where the Signature Base String is the text and the key is the concatenated values (each first 
+ * encoded per Parameter Encoding) of the Consumer Secret and Token Secret, separated by an '&' 
+ * character (ASCII code 38) even if empty.
+ *   - Chapter 9.2 ("HMAC-SHA1")
+ */
+class OAuthSignatureMethod_HMAC_SHA1 extends OAuthSignatureMethod {
+  function get_name() {
+    return "HMAC-SHA1";
+  }
+
+  public function build_signature($request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key = implode('&', $key_parts);
+
+    return base64_encode(hash_hmac('sha1', $base_string, $key, true));
+  }
+}
+
+/**
+ * The PLAINTEXT method does not provide any security protection and SHOULD only be used 
+ * over a secure channel such as HTTPS. It does not use the Signature Base String.
+ *   - Chapter 9.4 ("PLAINTEXT")
+ */
+class OAuthSignatureMethod_PLAINTEXT extends OAuthSignatureMethod {
+  public function get_name() {
+    return "PLAINTEXT";
+  }
+
+  /**
+   * oauth_signature is set to the concatenated encoded values of the Consumer Secret and 
+   * Token Secret, separated by a '&' character (ASCII code 38), even if either secret is 
+   * empty. The result MUST be encoded again.
+   *   - Chapter 9.4.1 ("Generating Signatures")
+   *
+   * Please note that the second encoding MUST NOT happen in the SignatureMethod, as
+   * OAuthRequest handles this!
+   */
+  public function build_signature($request, $consumer, $token) {
+    $key_parts = array(
+      $consumer->secret,
+      ($token) ? $token->secret : ""
+    );
+
+    $key_parts = OAuthUtil::urlencode_rfc3986($key_parts);
+    $key = implode('&', $key_parts);
+    $request->base_string = $key;
+
+    return $key;
+  }
+}
+
+/**
+ * The RSA-SHA1 signature method uses the RSASSA-PKCS1-v1_5 signature algorithm as defined in 
+ * [RFC3447] section 8.2 (more simply known as PKCS#1), using SHA-1 as the hash function for 
+ * EMSA-PKCS1-v1_5. It is assumed that the Consumer has provided its RSA public key in a 
+ * verified way to the Service Provider, in a manner which is beyond the scope of this 
+ * specification.
+ *   - Chapter 9.3 ("RSA-SHA1")
+ */
+abstract class OAuthSignatureMethod_RSA_SHA1 extends OAuthSignatureMethod {
+  public function get_name() {
+    return "RSA-SHA1";
+  }
+
+  // Up to the SP to implement this lookup of keys. Possible ideas are:
+  // (1) do a lookup in a table of trusted certs keyed off of consumer
+  // (2) fetch via http using a url provided by the requester
+  // (3) some sort of specific discovery code based on request
+  //
+  // Either way should return a string representation of the certificate
+  protected abstract function fetch_public_cert(&$request);
+
+  // Up to the SP to implement this lookup of keys. Possible ideas are:
+  // (1) do a lookup in a table of trusted certs keyed off of consumer
+  //
+  // Either way should return a string representation of the certificate
+  protected abstract function fetch_private_cert(&$request);
+
+  public function build_signature($request, $consumer, $token) {
+    $base_string = $request->get_signature_base_string();
+    $request->base_string = $base_string;
+
+    // Fetch the private key cert based on the request
+    $cert = $this->fetch_private_cert($request);
+
+    // Pull the private key ID from the certificate
+    $privatekeyid = openssl_get_privatekey($cert);
+
+    // Sign using the key
+    $ok = openssl_sign($base_string, $signature, $privatekeyid);
+
+    // Release the key resource
+    openssl_free_key($privatekeyid);
+
+    return base64_encode($signature);
+  }
+
+  public function check_signature($request, $consumer, $token, $signature) {
+    $decoded_sig = base64_decode($signature);
+
+    $base_string = $request->get_signature_base_string();
+
+    // Fetch the public key cert based on the request
+    $cert = $this->fetch_public_cert($request);
+
+    // Pull the public key ID from the certificate
+    $publickeyid = openssl_get_publickey($cert);
+
+    // Check the computed signature against the one passed in the query
+    $ok = openssl_verify($base_string, $decoded_sig, $publickeyid);
+
+    // Release the key resource
+    openssl_free_key($publickeyid);
+
+    return $ok == 1;
+  }
+}
+
+class OAuthRequest {
+  private $parameters;
+  private $http_method;
+  private $http_url;
+  // for debug purposes
+  public $base_string;
+  public static $version = '1.0';
+  public static $POST_INPUT = 'php://input';
+
+  function __construct($http_method, $http_url, $parameters=NULL) {
+    @$parameters or $parameters = array();
+    $parameters = array_merge( OAuthUtil::parse_parameters(parse_url($http_url, PHP_URL_QUERY)), $parameters);
+    $this->parameters = $parameters;
+    $this->http_method = $http_method;
+    $this->http_url = $http_url;
+  }
+
+
+  /**
+   * attempt to build up a request from what was passed to the server
+   */
+  public static function from_request($http_method=NULL, $http_url=NULL, $parameters=NULL) {
+    $scheme = (!isset($_SERVER['HTTPS']) || $_SERVER['HTTPS'] != "on")
+              ? 'http'
+              : 'https';
+    @$http_url or $http_url = $scheme .
+                              '://' . $_SERVER['HTTP_HOST'] .
+                              ':' .
+                              $_SERVER['SERVER_PORT'] .
+                              $_SERVER['REQUEST_URI'];
+    @$http_method or $http_method = $_SERVER['REQUEST_METHOD'];
+
+    // We weren't handed any parameters, so let's find the ones relevant to
+    // this request.
+    // If you run XML-RPC or similar you should use this to provide your own
+    // parsed parameter-list
+    if (!$parameters) {
+      // Find request headers
+      $request_headers = OAuthUtil::get_headers();
+
+      // Parse the query-string to find GET parameters
+      $parameters = OAuthUtil::parse_parameters($_SERVER['QUERY_STRING']);
+
+      // It's a POST request of the proper content-type, so parse POST
+      // parameters and add those overriding any duplicates from GET
+      if ($http_method == "POST"
+          && @strstr($request_headers["Content-Type"],
+                     "application/x-www-form-urlencoded")
+          ) {
+        $post_data = OAuthUtil::parse_parameters(
+          file_get_contents(self::$POST_INPUT)
+        );
+        $parameters = array_merge($parameters, $post_data);
+      }
+
+      // We have a Authorization-header with OAuth data. Parse the header
+      // and add those overriding any duplicates from GET or POST
+      if (@substr($request_headers['Authorization'], 0, 6) == "OAuth ") {
+        $header_parameters = OAuthUtil::split_header(
+          $request_headers['Authorization']
+        );
+        $parameters = array_merge($parameters, $header_parameters);
+      }
+
+    }
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  /**
+   * pretty much a helper function to set up the request
+   */
+  public static function from_consumer_and_token($consumer, $token, $http_method, $http_url, $parameters=NULL) {
+    @$parameters or $parameters = array();
+    $defaults = array("oauth_version" => OAuthRequest::$version,
+                      "oauth_nonce" => OAuthRequest::generate_nonce(),
+                      "oauth_timestamp" => OAuthRequest::generate_timestamp(),
+                      "oauth_consumer_key" => $consumer->key);
+    if ($token)
+      $defaults['oauth_token'] = $token->key;
+
+    $parameters = array_merge($defaults, $parameters);
+
+    return new OAuthRequest($http_method, $http_url, $parameters);
+  }
+
+  public function set_parameter($name, $value, $allow_duplicates = true) {
+    if ($allow_duplicates && isset($this->parameters[$name])) {
+      // We have already added parameter(s) with this name, so add to the list
+      if (is_scalar($this->parameters[$name])) {
+        // This is the first duplicate, so transform scalar (string)
+        // into an array so we can add the duplicates
+        $this->parameters[$name] = array($this->parameters[$name]);
+      }
+
+      $this->parameters[$name][] = $value;
+    } else {
+      $this->parameters[$name] = $value;
+    }
+  }
+
+  public function get_parameter($name) {
+    return isset($this->parameters[$name]) ? $this->parameters[$name] : null;
+  }
+
+  public function get_parameters() {
+    return $this->parameters;
+  }
+
+  public function unset_parameter($name) {
+    unset($this->parameters[$name]);
+  }
+
+  /**
+   * The request parameters, sorted and concatenated into a normalized string.
+   * @return string
+   */
+  public function get_signable_parameters() {
+    // Grab all parameters
+    $params = $this->parameters;
+
+    // Remove oauth_signature if present
+    // Ref: Spec: 9.1.1 ("The oauth_signature parameter MUST be excluded.")
+    if (isset($params['oauth_signature'])) {
+      unset($params['oauth_signature']);
+    }
+
+    return OAuthUtil::build_http_query($params);
+  }
+
+  /**
+   * Returns the base string of this request
+   *
+   * The base string defined as the method, the url
+   * and the parameters (normalized), each urlencoded
+   * and the concated with &.
+   */
+  public function get_signature_base_string() {
+    $parts = array(
+      $this->get_normalized_http_method(),
+      $this->get_normalized_http_url(),
+      $this->get_signable_parameters()
+    );
+
+    $parts = OAuthUtil::urlencode_rfc3986($parts);
+
+    return implode('&', $parts);
+  }
+
+  /**
+   * just uppercases the http method
+   */
+  public function get_normalized_http_method() {
+    return strtoupper($this->http_method);
+  }
+
+  /**
+   * parses the url and rebuilds it to be
+   * scheme://host/path
+   */
+  public function get_normalized_http_url() {
+    $parts = parse_url($this->http_url);
+
+    $port = @$parts['port'];
+    $scheme = $parts['scheme'];
+    $host = $parts['host'];
+    $path = @$parts['path'];
+
+    $port or $port = ($scheme == 'https') ? '443' : '80';
+
+    if (($scheme == 'https' && $port != '443')
+        || ($scheme == 'http' && $port != '80')) {
+      $host = "$host:$port";
+    }
+    return "$scheme://$host$path";
+  }
+
+  /**
+   * builds a url usable for a GET request
+   */
+  public function to_url() {
+    $post_data = $this->to_postdata();
+    $out = $this->get_normalized_http_url();
+    if ($post_data) {
+      $out .= '?'.$post_data;
+    }
+    return $out;
+  }
+
+  /**
+   * builds the data one would send in a POST request
+   */
+  public function to_postdata() {
+    return OAuthUtil::build_http_query($this->parameters);
+  }
+
+  /**
+   * builds the Authorization: header
+   */
+  public function to_header($realm=null) {
+    $first = true;
+	if($realm) {
+      $out = 'Authorization: OAuth realm="' . OAuthUtil::urlencode_rfc3986($realm) . '"';
+      $first = false;
+    } else
+      $out = 'Authorization: OAuth';
+
+    $total = array();
+    foreach ($this->parameters as $k => $v) {
+      if (substr($k, 0, 5) != "oauth") continue;
+      if (is_array($v)) {
+        throw new OAuthException('Arrays not supported in headers');
+      }
+      $out .= ($first) ? ' ' : ',';
+      $out .= OAuthUtil::urlencode_rfc3986($k) .
+              '="' .
+              OAuthUtil::urlencode_rfc3986($v) .
+              '"';
+      $first = false;
+    }
+    return $out;
+  }
+
+  public function __toString() {
+    return $this->to_url();
+  }
+
+
+  public function sign_request($signature_method, $consumer, $token) {
+    $this->set_parameter(
+      "oauth_signature_method",
+      $signature_method->get_name(),
+      false
+    );
+    $signature = $this->build_signature($signature_method, $consumer, $token);
+    $this->set_parameter("oauth_signature", $signature, false);
+  }
+
+  public function build_signature($signature_method, $consumer, $token) {
+    $signature = $signature_method->build_signature($this, $consumer, $token);
+    return $signature;
+  }
+
+  /**
+   * util function: current timestamp
+   */
+  private static function generate_timestamp() {
+    return time();
+  }
+
+  /**
+   * util function: current nonce
+   */
+  private static function generate_nonce() {
+    $mt = microtime();
+    $rand = mt_rand();
+
+    return md5($mt . $rand); // md5s look nicer than numbers
+  }
+}
+
+class OAuthServer {
+  protected $timestamp_threshold = 300; // in seconds, five minutes
+  protected $version = '1.0';             // hi blaine
+  protected $signature_methods = array();
+
+  protected $data_store;
+
+  function __construct($data_store) {
+    $this->data_store = $data_store;
+  }
+
+  public function add_signature_method($signature_method) {
+    $this->signature_methods[$signature_method->get_name()] =
+      $signature_method;
+  }
+
+  // high level functions
+
+  /**
+   * process a request_token request
+   * returns the request token on success
+   */
+  public function fetch_request_token(&$request) {
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // no token required for the initial token request
+    $token = NULL;
+
+    $this->check_signature($request, $consumer, $token);
+
+    // Rev A change
+    $callback = $request->get_parameter('oauth_callback');
+    $new_token = $this->data_store->new_request_token($consumer, $callback);
+
+    return $new_token;
+  }
+
+  /**
+   * process an access_token request
+   * returns the access token on success
+   */
+  public function fetch_access_token(&$request) {
+    $this->get_version($request);
+
+    $consumer = $this->get_consumer($request);
+
+    // requires authorized request token
+    $token = $this->get_token($request, $consumer, "request");
+
+    $this->check_signature($request, $consumer, $token);
+
+    // Rev A change
+    $verifier = $request->get_parameter('oauth_verifier');
+    $new_token = $this->data_store->new_access_token($token, $consumer, $verifier);
+
+    return $new_token;
+  }
+
+  /**
+   * verify an api call, checks all the parameters
+   */
+  public function verify_request(&$request) {
+    $this->get_version($request);
+    $consumer = $this->get_consumer($request);
+    $token = $this->get_token($request, $consumer, "access");
+    $this->check_signature($request, $consumer, $token);
+    return array($consumer, $token);
+  }
+
+  // Internals from here
+  /**
+   * version 1
+   */
+  private function get_version(&$request) {
+    $version = $request->get_parameter("oauth_version");
+    if (!$version) {
+      // Service Providers MUST assume the protocol version to be 1.0 if this parameter is not present. 
+      // Chapter 7.0 ("Accessing Protected Ressources")
+      $version = '1.0';
+    }
+    if ($version !== $this->version) {
+      throw new OAuthException("OAuth version '$version' not supported");
+    }
+    return $version;
+  }
+
+  /**
+   * figure out the signature with some defaults
+   */
+  private function get_signature_method(&$request) {
+    $signature_method =
+        @$request->get_parameter("oauth_signature_method");
+
+    if (!$signature_method) {
+      // According to chapter 7 ("Accessing Protected Ressources") the signature-method
+      // parameter is required, and we can't just fallback to PLAINTEXT
+      throw new OAuthException('No signature method parameter. This parameter is required');
+    }
+
+    if (!in_array($signature_method,
+                  array_keys($this->signature_methods))) {
+      throw new OAuthException(
+        "Signature method '$signature_method' not supported " .
+        "try one of the following: " .
+        implode(", ", array_keys($this->signature_methods))
+      );
+    }
+    return $this->signature_methods[$signature_method];
+  }
+
+  /**
+   * try to find the consumer for the provided request's consumer key
+   */
+  private function get_consumer(&$request) {
+    $consumer_key = @$request->get_parameter("oauth_consumer_key");
+    if (!$consumer_key) {
+      throw new OAuthException("Invalid consumer key");
+    }
+
+    $consumer = $this->data_store->lookup_consumer($consumer_key);
+    if (!$consumer) {
+      throw new OAuthException("Invalid consumer");
+    }
+
+    return $consumer;
+  }
+
+  /**
+   * try to find the token for the provided request's token key
+   */
+  private function get_token(&$request, $consumer, $token_type="access") {
+    $token_field = @$request->get_parameter('oauth_token');
+    $token = $this->data_store->lookup_token(
+      $consumer, $token_type, $token_field
+    );
+    if (!$token) {
+      throw new OAuthException("Invalid $token_type token: $token_field");
+    }
+    return $token;
+  }
+
+  /**
+   * all-in-one function to check the signature on a request
+   * should guess the signature method appropriately
+   */
+  private function check_signature(&$request, $consumer, $token) {
+    // this should probably be in a different method
+    $timestamp = @$request->get_parameter('oauth_timestamp');
+    $nonce = @$request->get_parameter('oauth_nonce');
+
+    $this->check_timestamp($timestamp);
+    $this->check_nonce($consumer, $token, $nonce, $timestamp);
+
+    $signature_method = $this->get_signature_method($request);
+
+    $signature = $request->get_parameter('oauth_signature');
+    $valid_sig = $signature_method->check_signature(
+      $request,
+      $consumer,
+      $token,
+      $signature
+    );
+
+    if (!$valid_sig) {
+      throw new OAuthException("Invalid signature");
+    }
+  }
+
+  /**
+   * check that the timestamp is new enough
+   */
+  private function check_timestamp($timestamp) {
+    if( ! $timestamp )
+      throw new OAuthException(
+        'Missing timestamp parameter. The parameter is required'
+      );
+    
+    // verify that timestamp is recentish
+    $now = time();
+    if (abs($now - $timestamp) > $this->timestamp_threshold) {
+      throw new OAuthException(
+        "Expired timestamp, yours $timestamp, ours $now"
+      );
+    }
+  }
+
+  /**
+   * check that the nonce is not repeated
+   */
+  private function check_nonce($consumer, $token, $nonce, $timestamp) {
+    if( ! $nonce )
+      throw new OAuthException(
+        'Missing nonce parameter. The parameter is required'
+      );
+
+    // verify that the nonce is uniqueish
+    $found = $this->data_store->lookup_nonce(
+      $consumer,
+      $token,
+      $nonce,
+      $timestamp
+    );
+    if ($found) {
+      throw new OAuthException("Nonce already used: $nonce");
+    }
+  }
+
+}
+
+class OAuthDataStore {
+  function lookup_consumer($consumer_key) {
+    // implement me
+  }
+
+  function lookup_token($consumer, $token_type, $token) {
+    // implement me
+  }
+
+  function lookup_nonce($consumer, $token, $nonce, $timestamp) {
+    // implement me
+  }
+
+  function new_request_token($consumer, $callback = null) {
+    // return a new token attached to this consumer
+  }
+
+  function new_access_token($token, $consumer, $verifier = null) {
+    // return a new access token attached to this consumer
+    // for the user associated with this token if the request token
+    // is authorized
+    // should also invalidate the request token
+  }
+
+}
+
+class OAuthUtil {
+  public static function urlencode_rfc3986($input) {
+  if (is_array($input)) {
+    return array_map(array('OAuthUtil', 'urlencode_rfc3986'), $input);
+  } else if (is_scalar($input)) {
+    return str_replace(
+      '+',
+      ' ',
+      str_replace('%7E', '~', rawurlencode($input))
+    );
+  } else {
+    return '';
+  }
+}
+
+
+  // This decode function isn't taking into consideration the above
+  // modifications to the encoding process. However, this method doesn't
+  // seem to be used anywhere so leaving it as is.
+  public static function urldecode_rfc3986($string) {
+    return urldecode($string);
+  }
+
+  // Utility function for turning the Authorization: header into
+  // parameters, has to do some unescaping
+  // Can filter out any non-oauth parameters if needed (default behaviour)
+  public static function split_header($header, $only_allow_oauth_parameters = true) {
+    $pattern = '/(([-_a-z]*)=("([^"]*)"|([^,]*)),?)/';
+    $offset = 0;
+    $params = array();
+    while (preg_match($pattern, $header, $matches, PREG_OFFSET_CAPTURE, $offset) > 0) {
+      $match = $matches[0];
+      $header_name = $matches[2][0];
+      $header_content = (isset($matches[5])) ? $matches[5][0] : $matches[4][0];
+      if (preg_match('/^oauth_/', $header_name) || !$only_allow_oauth_parameters) {
+        $params[$header_name] = OAuthUtil::urldecode_rfc3986($header_content);
+      }
+      $offset = $match[1] + strlen($match[0]);
+    }
+
+    if (isset($params['realm'])) {
+      unset($params['realm']);
+    }
+
+    return $params;
+  }
+
+  // helper to try to sort out headers for people who aren't running apache
+  public static function get_headers() {
+    if (function_exists('apache_request_headers')) {
+      // we need this to get the actual Authorization: header
+      // because apache tends to tell us it doesn't exist
+      $headers = apache_request_headers();
+
+      // sanitize the output of apache_request_headers because
+      // we always want the keys to be Cased-Like-This and arh()
+      // returns the headers in the same case as they are in the
+      // request
+      $out = array();
+      foreach( $headers AS $key => $value ) {
+        $key = str_replace(
+            " ",
+            "-",
+            ucwords(strtolower(str_replace("-", " ", $key)))
+          );
+        $out[$key] = $value;
+      }
+    } else {
+      // otherwise we don't have apache and are just going to have to hope
+      // that $_SERVER actually contains what we need
+      $out = array();
+      if( isset($_SERVER['CONTENT_TYPE']) )
+        $out['Content-Type'] = $_SERVER['CONTENT_TYPE'];
+      if( isset($_ENV['CONTENT_TYPE']) )
+        $out['Content-Type'] = $_ENV['CONTENT_TYPE'];
+
+      foreach ($_SERVER as $key => $value) {
+        if (substr($key, 0, 5) == "HTTP_") {
+          // this is chaos, basically it is just there to capitalize the first
+          // letter of every word that is not an initial HTTP and strip HTTP
+          // code from przemek
+          $key = str_replace(
+            " ",
+            "-",
+            ucwords(strtolower(str_replace("_", " ", substr($key, 5))))
+          );
+          $out[$key] = $value;
+        }
+      }
+    }
+    return $out;
+  }
+
+  // This function takes a input like a=b&a=c&d=e and returns the parsed
+  // parameters like this
+  // array('a' => array('b','c'), 'd' => 'e')
+  public static function parse_parameters( $input ) {
+    if (!isset($input) || !$input) return array();
+
+    $pairs = explode('&', $input);
+
+    $parsed_parameters = array();
+    foreach ($pairs as $pair) {
+      $split = explode('=', $pair, 2);
+      $parameter = OAuthUtil::urldecode_rfc3986($split[0]);
+      $value = isset($split[1]) ? OAuthUtil::urldecode_rfc3986($split[1]) : '';
+
+      if (isset($parsed_parameters[$parameter])) {
+        // We have already recieved parameter(s) with this name, so add to the list
+        // of parameters with this name
+
+        if (is_scalar($parsed_parameters[$parameter])) {
+          // This is the first duplicate, so transform scalar (string) into an array
+          // so we can add the duplicates
+          $parsed_parameters[$parameter] = array($parsed_parameters[$parameter]);
+        }
+
+        $parsed_parameters[$parameter][] = $value;
+      } else {
+        $parsed_parameters[$parameter] = $value;
+      }
+    }
+    return $parsed_parameters;
+  }
+
+  public static function build_http_query($params) {
+    if (!$params) return '';
+
+    // Urlencode both keys and values
+    $keys = OAuthUtil::urlencode_rfc3986(array_keys($params));
+    $values = OAuthUtil::urlencode_rfc3986(array_values($params));
+    $params = array_combine($keys, $values);
+
+    // Parameters are sorted by name, using lexicographical byte value ordering.
+    // Ref: Spec: 9.1.1 (1)
+    uksort($params, 'strcmp');
+
+    $pairs = array();
+    foreach ($params as $parameter => $value) {
+      if (is_array($value)) {
+        // If two or more parameters share the same name, they are sorted by their value
+        // Ref: Spec: 9.1.1 (1)
+        natsort($value);
+        foreach ($value as $duplicate_value) {
+          $pairs[] = $parameter . '=' . $duplicate_value;
+        }
+      } else {
+        $pairs[] = $parameter . '=' . $value;
+      }
+    }
+    // For each parameter, the name is separated from the corresponding value by an '=' character (ASCII code 61)
+    // Each name-value pair is separated by an '&' character (ASCII code 38)
+    return implode('&', $pairs);
+  }
+}
+
+?>
diff --git a/include/twitteroauth/twitteroauth-old.php b/include/twitteroauth/twitteroauth-old.php
new file mode 100644
index 0000000..674308a
--- /dev/null
+++ b/include/twitteroauth/twitteroauth-old.php
@@ -0,0 +1,245 @@
+<?php
+
+/*
+ * Abraham Williams (abraham@abrah.am) http://abrah.am
+ *
+ * The first PHP Library to support OAuth for Twitter's REST API.
+ */
+
+/* Load OAuth lib. You can find it at http://oauth.net */
+require_once('OAuth.php');
+
+/**
+ * Twitter OAuth class
+ */
+class TwitterOAuth {
+  /* Contains the last HTTP status code returned. */
+  public $http_code;
+  /* Contains the last API call. */
+  public $url;
+  /* Set up the API root URL. */
+  public $host = "https://api.twitter.com/1/";
+  /* Set timeout default. */
+  public $timeout = 30;
+  /* Set connect timeout. */
+  public $connecttimeout = 30; 
+  /* Verify SSL Cert. */
+  public $ssl_verifypeer = FALSE;
+  /* Respons format. */
+  public $format = 'json';
+  /* Decode returned json data. */
+  public $decode_json = TRUE;
+  /* Contains the last HTTP headers returned. */
+  public $http_info;
+  /* Set the useragnet. */
+  public $useragent = 'TwitterOAuth v0.2.0-beta2';
+  /* Immediately retry the API call if the response was not successful. */
+  //public $retry = TRUE;
+
+
+
+
+  /**
+   * Set API URLS
+   */
+  function accessTokenURL()  { return 'https://api.twitter.com/oauth/access_token'; }
+  function authenticateURL() { return 'https://twitter.com/oauth/authenticate'; }
+  function authorizeURL()    { return 'https://twitter.com/oauth/authorize'; }
+  function requestTokenURL() { return 'https://api.twitter.com/oauth/request_token'; }
+
+  /**
+   * Debug helpers
+   */
+  function lastStatusCode() { return $this->http_status; }
+  function lastAPICall() { return $this->last_api_call; }
+
+  /**
+   * construct TwitterOAuth object
+   */
+  function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+    $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+    $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+    if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+      $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+    } else {
+      $this->token = NULL;
+    }
+  }
+
+
+  /**
+   * Get a request_token from Twitter
+   *
+   * @returns a key/value array containing oauth_token and oauth_token_secret
+   */
+  function getRequestToken($oauth_callback = NULL) {
+    $parameters = array();
+    if (!empty($oauth_callback)) {
+      $parameters['oauth_callback'] = $oauth_callback;
+    } 
+    $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * Get the authorize URL
+   *
+   * @returns a string
+   */
+  function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) {
+    if (is_array($token)) {
+      $token = $token['oauth_token'];
+    }
+    if (empty($sign_in_with_twitter)) {
+      return $this->authorizeURL() . "?oauth_token={$token}";
+    } else {
+       return $this->authenticateURL() . "?oauth_token={$token}";
+    }
+  }
+
+  /**
+   * Exchange request token and secret for an access token and
+   * secret, to sign API calls.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham")
+   */
+  function getAccessToken($oauth_verifier = FALSE) {
+    $parameters = array();
+    if (!empty($oauth_verifier)) {
+      $parameters['oauth_verifier'] = $oauth_verifier;
+    }
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * One time exchange of username and password for access token and secret.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham",
+   *                "x_auth_expires" => "0")
+   */  
+  function getXAuthToken($username, $password) {
+    $parameters = array();
+    $parameters['x_auth_username'] = $username;
+    $parameters['x_auth_password'] = $password;
+    $parameters['x_auth_mode'] = 'client_auth';
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * GET wrapper for oAuthRequest.
+   */
+  function get($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'GET', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+  
+  /**
+   * POST wrapper for oAuthRequest.
+   */
+  function post($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'POST', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * DELETE wrapper for oAuthReqeust.
+   */
+  function delete($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'DELETE', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * Format and sign an OAuth / API request
+   */
+  function oAuthRequest($url, $method, $parameters) {
+    if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+      $url = "{$this->host}{$url}.{$this->format}";
+    }
+    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+    $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+    switch ($method) {
+    case 'GET':
+      return $this->http($request->to_url(), 'GET');
+    default:
+      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+    }
+  }
+
+  /**
+   * Make an HTTP request
+   *
+   * @return API results
+   */
+  function http($url, $method, $postfields = NULL) {
+    $this->http_info = array();
+    $ci = curl_init();
+    /* Curl settings */
+    curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+    curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+    curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+    curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+    curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+    curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+    curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
+    curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+    switch ($method) {
+      case 'POST':
+        curl_setopt($ci, CURLOPT_POST, TRUE);
+        if (!empty($postfields)) {
+          curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+        }
+        break;
+      case 'DELETE':
+        curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        if (!empty($postfields)) {
+          $url = "{$url}?{$postfields}";
+        }
+    }
+
+    curl_setopt($ci, CURLOPT_URL, $url);
+    $response = curl_exec($ci);
+    $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+    $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+    $this->url = $url;
+    curl_close ($ci);
+    return $response;
+  }
+
+  /**
+   * Get the header info to store.
+   */
+  function getHeader($ch, $header) {
+    $i = strpos($header, ':');
+    if (!empty($i)) {
+      $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+      $value = trim(substr($header, $i + 2));
+      $this->http_header[$key] = $value;
+    }
+    return strlen($header);
+  }
+}
diff --git a/include/twitteroauth/twitteroauth.php b/include/twitteroauth/twitteroauth.php
new file mode 100644
index 0000000..0fdc135
--- /dev/null
+++ b/include/twitteroauth/twitteroauth.php
@@ -0,0 +1,246 @@
+<?php
+
+/*
+ * Abraham Williams (abraham@abrah.am) http://abrah.am
+ *
+ * The first PHP Library to support OAuth for Twitter's REST API.
+ */
+
+/* Load OAuth lib. You can find it at http://oauth.net */
+require_once('OAuth.php');
+
+/**
+ * Twitter OAuth class
+ */
+class TwitterOAuth {
+  /* Contains the last HTTP status code returned. */
+  public $http_code;
+  /* Contains the last API call. */
+  public $url;
+  /* Set up the API root URL. */
+  public $host = "https://api.twitter.com/1/";
+  /* Set timeout default. */
+  public $timeout = 30;
+  /* Set connect timeout. */
+  public $connecttimeout = 30; 
+  /* Verify SSL Cert. */
+  public $ssl_verifypeer = FALSE;
+  /* Respons format. */
+  public $format = 'json';
+  /* Decode returned json data. */
+  public $decode_json = TRUE;
+  /* Contains the last HTTP headers returned. */
+  public $http_info;
+  /* Set the useragnet. */
+  public $useragent = 'TwitterOAuth v0.2.0-beta2';
+  /* Immediately retry the API call if the response was not successful. */
+  //public $retry = TRUE;
+
+
+
+
+  /**
+   * Set API URLS
+   */
+  function accessTokenURL()  { return 'https://api.twitter.com/oauth/access_token'; }
+  function authenticateURL() { return 'https://api.twitter.com/oauth/authenticate'; }
+  function authorizeURL()    { return 'https://api.twitter.com/oauth/authorize'; }
+  function requestTokenURL() { return 'https://api.twitter.com/oauth/request_token'; }
+
+  /**
+   * Debug helpers
+   */
+  function lastStatusCode() { return $this->http_status; }
+  function lastAPICall() { return $this->last_api_call; }
+
+  /**
+   * construct TwitterOAuth object
+   */
+  function __construct($consumer_key, $consumer_secret, $oauth_token = NULL, $oauth_token_secret = NULL) {
+    $this->sha1_method = new OAuthSignatureMethod_HMAC_SHA1();
+    $this->consumer = new OAuthConsumer($consumer_key, $consumer_secret);
+    if (!empty($oauth_token) && !empty($oauth_token_secret)) {
+      $this->token = new OAuthConsumer($oauth_token, $oauth_token_secret);
+    } else {
+      $this->token = NULL;
+    }
+  }
+
+
+  /**
+   * Get a request_token from Twitter
+   *
+   * @returns a key/value array containing oauth_token and oauth_token_secret
+   */
+  function getRequestToken($oauth_callback = NULL) {
+    $parameters = array();
+    if (!empty($oauth_callback)) {
+      $parameters['oauth_callback'] = $oauth_callback;
+    } 
+    $request = $this->oAuthRequest($this->requestTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * Get the authorize URL
+   *
+   * @returns a string
+   */
+  function getAuthorizeURL($token, $sign_in_with_twitter = TRUE) {
+    if (is_array($token)) {
+      $token = $token['oauth_token'];
+    }
+    if (empty($sign_in_with_twitter)) {
+      return $this->authorizeURL() . "?oauth_token={$token}";
+    } else {
+       return $this->authenticateURL() . "?oauth_token={$token}";
+    }
+  }
+
+  /**
+   * Exchange request token and secret for an access token and
+   * secret, to sign API calls.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham")
+   */
+  function getAccessToken($oauth_verifier = FALSE) {
+    $parameters = array();
+    if (!empty($oauth_verifier)) {
+      $parameters['oauth_verifier'] = $oauth_verifier;
+    }
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'GET', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * One time exchange of username and password for access token and secret.
+   *
+   * @returns array("oauth_token" => "the-access-token",
+   *                "oauth_token_secret" => "the-access-secret",
+   *                "user_id" => "9436992",
+   *                "screen_name" => "abraham",
+   *                "x_auth_expires" => "0")
+   */  
+  function getXAuthToken($username, $password) {
+    $parameters = array();
+    $parameters['x_auth_username'] = $username;
+    $parameters['x_auth_password'] = $password;
+    $parameters['x_auth_mode'] = 'client_auth';
+    $request = $this->oAuthRequest($this->accessTokenURL(), 'POST', $parameters);
+    $token = OAuthUtil::parse_parameters($request);
+    $this->token = new OAuthConsumer($token['oauth_token'], $token['oauth_token_secret']);
+    return $token;
+  }
+
+  /**
+   * GET wrapper for oAuthRequest.
+   */
+  function get($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'GET', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+  
+  /**
+   * POST wrapper for oAuthRequest.
+   */
+  function post($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'POST', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * DELETE wrapper for oAuthReqeust.
+   */
+  function delete($url, $parameters = array()) {
+    $response = $this->oAuthRequest($url, 'DELETE', $parameters);
+    if ($this->format === 'json' && $this->decode_json) {
+      return json_decode($response);
+    }
+    return $response;
+  }
+
+  /**
+   * Format and sign an OAuth / API request
+   */
+  function oAuthRequest($url, $method, $parameters) {
+    if (strrpos($url, 'https://') !== 0 && strrpos($url, 'http://') !== 0) {
+      $url = "{$this->host}{$url}.{$this->format}";
+    }
+    $request = OAuthRequest::from_consumer_and_token($this->consumer, $this->token, $method, $url, $parameters);
+    $request->sign_request($this->sha1_method, $this->consumer, $this->token);
+    switch ($method) {
+    case 'GET':
+      return $this->http($request->to_url(), 'GET');
+    default:
+      return $this->http($request->get_normalized_http_url(), $method, $request->to_postdata());
+    }
+  }
+
+  /**
+   * Make an HTTP request
+   *
+   * @return API results
+   */
+  function http($url, $method, $postfields = NULL) {
+    $this->http_info = array();
+    $ci = curl_init();
+    /* Curl settings */
+    curl_setopt($ci, CURLOPT_USERAGENT, $this->useragent);
+    curl_setopt($ci, CURLOPT_CONNECTTIMEOUT, $this->connecttimeout);
+    curl_setopt($ci, CURLOPT_TIMEOUT, $this->timeout);
+    curl_setopt($ci, CURLOPT_RETURNTRANSFER, TRUE);
+    curl_setopt($ci, CURLOPT_HTTPHEADER, array('Expect:'));
+    curl_setopt($ci, CURLOPT_SSL_VERIFYPEER, $this->ssl_verifypeer);
+    curl_setopt($ci, CURLOPT_HEADERFUNCTION, array($this, 'getHeader'));
+    curl_setopt($ci, CURLOPT_HEADER, FALSE);
+
+    switch ($method) {
+      case 'POST':
+        curl_setopt($ci, CURLOPT_POST, TRUE);
+        if (!empty($postfields)) {
+          curl_setopt($ci, CURLOPT_POSTFIELDS, $postfields);
+        }
+        break;
+      case 'DELETE':
+        curl_setopt($ci, CURLOPT_CUSTOMREQUEST, 'DELETE');
+        if (!empty($postfields)) {
+          $url = "{$url}?{$postfields}";
+        }
+    }
+
+    curl_setopt($ci, CURLOPT_URL, $url);
+    $response = curl_exec($ci);
+    $this->http_code = curl_getinfo($ci, CURLINFO_HTTP_CODE);
+    $this->http_info = array_merge($this->http_info, curl_getinfo($ci));
+    $this->url = $url;
+    curl_close ($ci);
+    return $response;
+  }
+
+  /**
+   * Get the header info to store.
+   */
+  function getHeader($ch, $header) {
+    $i = strpos($header, ':');
+    if (!empty($i)) {
+      $key = str_replace('-', '_', strtolower(substr($header, 0, $i)));
+      $value = trim(substr($header, $i + 2));
+      $this->http_header[$key] = $value;
+    }
+    return strlen($header);
+  }
+}
+
diff --git a/include/type.php b/include/type.php
new file mode 100644
index 0000000..907c517
--- /dev/null
+++ b/include/type.php
@@ -0,0 +1,27 @@
+<?php
+
+/* Types */
+
+function get_typeByID( $id ) {
+	global $mtdb;
+	$id = (int)$id;
+	$r = $mtdb->getRow( 'SELECT id, name, description FROM strip_t WHERE id=' . $id );
+	$r->meta = $mtdb->getAll( 'SELECT meta as id from meta where type=' . $id);	
+	return $r;
+}
+
+function get_allTypes() {
+	global $mtdb;
+	return $mtdb->getRow( 'SELECT id, name, description, meta FROM strip_t' );
+}
+
+function get_allMetaTypes() {
+	global $mtdb;
+	return $mtdb->getAll("SELECT id, name FROM meta_t");
+}
+
+function _getMetaNameFromObject($obj) {
+	return $obj->name;
+}
+
+?>
\ No newline at end of file
diff --git a/include/uploads.php b/include/uploads.php
new file mode 100644
index 0000000..516add7
--- /dev/null
+++ b/include/uploads.php
@@ -0,0 +1,105 @@
+<?php
+
+// Do we have a rant image being uploaded?
+function is_valid_upload( $field = 'ranterImage', $index = null ) {
+	global $_FILES;
+	if( !$_FILES[$field] ) return false;
+#		echo "Passed test 1<br>";
+
+	if(is_null($index)) {
+		if( '' == $_FILES[$field]['tmp_name'] ) return false;
+#			echo "Passed single test 2<br>";
+		if( UPLOAD_ERR_NO_FILE == $_FILES[$field]['error'] ) return false;
+#			echo "Passed single test 3<br>";
+		if( 0 == $_FILES[$field]['size'] ) return false;
+#			echo "Passed single test 4<br>";
+	} else {
+		if( !is_array($_FILES[$field]['tmp_name']) ) return false;
+#			echo "Passed array text 2<br>";
+		if( '' == $_FILES[$field]['tmp_name'][$index] ) return false;
+#			echo "Passed array test 3<br>";
+		if( UPLOAD_ERR_NO_FILE == $_FILES[$field]['error'][$index] ) return false;
+#			echo "Passed array test 4<br>";
+		if( 0 == $_FILES[$field]['size'][$index] ) return false;
+#			echo "Passed array test 5<br>";
+	}
+
+	return true;
+}
+
+
+function pre_upload_rant_image( $pathtofile ) {
+	if( !is_valid_upload() ) return array();
+	$image_data = getimagesize( $pathtofile );
+	$doing_upload = false;
+	$upload_imagetype = null;
+	$upload_error = false;
+	
+	if( false === $image_data ) {
+		$upload_error='<p>Something wronky happened with that upload, getimagesize() returned false!</p>';
+	} elseif( 300 > $image_data[0] ) {
+		$upload_error='<p>Image too narrow, only '.$image_data[0].'px tall. Rant saved as draft. Try uploading image again.</p>';
+	} elseif ( 245 > $image_data[1] ) {
+		$upload_error='<p>Image too short, only '.$image_data[1].'px tall. Rant saved as draft. Try uploading image again.</p>';
+	} elseif( false === $image_data[2] ) {
+		$upload_error='<p>Unknown image type or extension. Upload refused. Rant saved as draft. Try uploading image again.</p>';
+	} elseif( !is_uploaded_file( $pathtofile ) ) {
+		$upload_error="<p>Something bad happened, that's not a valid file upload! Rant saved as draft. Try uploading image again.</p>";
+	} else {
+		// Valid upload. It will be moved into place later.
+		$upload_imagetype = $image_data[2];
+		$doing_upload = true;
+	}
+	return compact( "upload_error", "doing_upload", "upload_imagetype" );
+}
+
+function save_stock_rant_image( $source, $rant ) {	
+	if( copy( sprintf( '%s/%s/%s', SITE_PATH_ABS,SITE_RANT,$source),
+		SITE_PATH_ABS .'/'.get_rantimage_filename($rant) ) ) {
+		$upload_info='<p>Default rant image copied.</p>';
+	} else {
+		$upload_error='<p>There was an error copying the default rant image into place.</p>';
+	}
+	return compact("upload_info","upload_error");
+}
+
+function save_upload_rant_image( $source, $rant ) {
+	$destination = SITE_PATH_ABS.'/'.get_rantimage_filename($rant);
+	$size = getimagesize($source);
+
+	if(300 == $size[0] && 245 == $size[1]) {
+		if( move_uploaded_file($source, $destination) ) {
+			$upload_info='<p>New rant image uploaded for rant '. $rant->id .'.</p>';
+		} else {
+			$upload_error='<p>Something went wrong while moving the uploaded image.</p>';
+		} 
+	} else {
+		if( crop_resize($source, $destination) ) {
+			$upload_info='<p>New rant image uploaded and resized for rant '. $rant->id .'.</p>';
+		} else {
+			$upload_error='<p>Something went wrong while transforming the uploaded image.</p>';
+		}
+	}
+
+	return compact("upload_info","upload_error");
+}
+
+function save_upload_rant_attachment( $source, $rant )
+{
+	global $mtdb;
+
+	$image_data = getimagesize( $source );
+	$mtdb->query( "INSERT INTO rant_attachment (rant, media) VALUES ($rant, $image_data[2])" );
+	$rant_attachment_id = mysql_insert_id( $mtdb->link );
+
+	if( move_uploaded_file($source, SITE_PATH_ABS.'/'.get_rantattachment_filename($rant_attachment_id) ) ) {
+		$upload_info='<p>New rant attachment uploaded for rant '. $rant .'.</p>';
+		adminlog('Rant attachment uploaded', MTS_RANT, MTA_ADD);
+	} else {
+		$upload_error='<p>Something went wrong while storing the attachment.</p>';
+	} 
+
+	return compact("rant_attachment_id","upload_info","upload_error");
+}
+
+?>
diff --git a/include/user.php b/include/user.php
new file mode 100644
index 0000000..c8fbdb8
--- /dev/null
+++ b/include/user.php
@@ -0,0 +1,35 @@
+<?php
+
+$currentuser=false;
+
+function getCurrentUser() {
+	global $currentuser;
+	echo $currentuser->name;
+}
+
+function get_userdatabyid( $id ) {
+	global $mtdb;	
+	return $mtdb->getRow( 'SELECT id,name,email,nameplate,default_image,default_link FROM contributor WHERE id = ' . (int)$id );
+}
+
+function get_userdatabylogin( $username ) {
+	global $mtdb;
+	return $mtdb->getRow( 'SELECT id,name,email,nameplate,default_image,default_link FROM contributor WHERE name = "' . mysql_real_escape_string($username) . '"' );
+}
+
+function save_userdata( $user ) {
+	adminlog("Saved changes to user ".$user->id." (".$user->name.").", MTS_USER, MTA_UPDATE);
+	global $mtdb;
+	return $mtdb->query( sprintf( 'UPDATE contributor SET email="%s", nameplate="%s", default_image="%s", default_link="%s" WHERE id=%d',
+		mysql_real_escape_string($user->email), mysql_real_escape_string($user->nameplate),
+		mysql_real_escape_string($user->default_image), mysql_real_escape_string($user->default_link), $user->id) );
+}
+
+function change_password( $user ) {
+	adminlog("Changed password for user ".$user->id." (".$user->name.").", MTS_USER, MTA_UPDATE);
+	global $mtdb, $currentuser;
+	if( $currentuser->id === $user->id ) mt_setcookie($user->name, $user->password, false, ADMINURL, FALSE );
+	return $mtdb->query( 'UPDATE contributor SET password=SHA1( "' . mysql_real_escape_string($user->password) . '" ) WHERE id = "' . mysql_real_escape_string($user->id) . '"' );
+}
+
+?>
diff --git a/index.php b/index.php
new file mode 100644
index 0000000..b48caa1
--- /dev/null
+++ b/index.php
@@ -0,0 +1,109 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+function human_time_diff( $from, $to = '' ) {
+	if ( empty($to) )
+		$to = time();
+	$diff = (int) abs($to - $from);
+	if ($diff <= 3600) {
+		$mins = round($diff / 60);
+		if ($mins <= 1) {
+			$mins = 1;
+		}
+		$since = sprintf( $mins == 1 ? '%s minute' : '%s minutes', $mins);
+	} elseif ($diff <= 86400) {
+		$hours = round($diff / 3600);
+		if ($hours <= 1) {
+			$hour = 1;
+		}
+		$since = sprintf( $hours == 1 ? '%s hour' : '%s hours', $hours);
+	} elseif($diff <= 604800 ) {
+		$days = round($diff / 86400);
+		if ($days <= 1) {
+			$days = 1;
+		}
+		$since = sprintf( $days == 1 ? '%s day' : '%s days', $days);
+	} else { 
+		$weeks = round($diff / 604800);
+		if( $weeks <= 1) {
+			$weeks = 1;
+		}
+		$since = sprintf( $weeks == 1 ? '%s week' : '%s weeks', $weeks);
+	}
+
+	return $since;
+}
+
+
+adminhead();
+adminmenu();
+?>
+<h2>Scratchpad</h2>
+<form method="post" action="post-scratchpad.php">
+<?php nonce_field('new-scratchpad'); ?>
+	<ul class="historic">
+	<?php
+		$strips = array_reverse( $mtdb->getAll('SELECT UNIX_TIMESTAMP(s.published) AS pubdate, c.name, s.message FROM scratchpad s JOIN contributor c ON s.contributor = c.id ORDER BY published DESC LIMIT 5') );
+
+		foreach($strips as $k=>$v)
+		{
+			$message = preg_replace('/(https?\:\/\/[^"\s\<\>]*[^.,;\'">\:\s\<\>\)\]\!])/i',
+				'<a href="$1">$1</a>', htmlentities($v->message));
+			printf( '<li>%s wrote %s ago: %s</li>', htmlspecialchars($v->name), human_time_diff($v->pubdate), $message);
+		}
+	?>
+	</ul>
+	<p style="padding-bottom:1em;"><input type="text" name="message" /><input type="submit" value="Send" /></p>
+	
+</form><br>
+
+<h2>Recent Strips</h2>
+<ul class="historic">
+<?php
+$strips = $mtdb->getAll("SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published <= NOW() order by id DESC LIMIT 5");
+
+foreach($strips as $k=>$v) {
+	printf( '<li>%d: <a href="%s/index.php?strip_id=%d">%s</a>, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
+}
+?>
+</ul><br>
+
+<h2>Upcoming Strips</h2>
+<ul class="historic">
+<?php
+$strips = $mtdb->getAll("SELECT distinct id, title, UNIX_TIMESTAMP(published) as date FROM strip WHERE published > NOW() order by id ASC LIMIT 5");
+
+foreach($strips as $k=>$v) {
+	printf( '<li>%d: <a href="%s/edit-comic.php?strip_id=%d">%s</a>, in %s</li>', $v->id, SITE_HOST . SITE_PATH . '/' . SITE_ADMIN, $v->id, htmlspecialchars($v->title), human_time_diff($v->date) );
+}
+?>
+</ul><br>
+
+<h2>Recent Published Rants</h2>
+<ul class="historic">
+<?php
+$rants = $mtdb->getAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'published\' ORDER BY rant.published DESC limit 5');
+
+foreach($rants as $k=>$v) {
+	printf( '<li>%d: <a href="%s/index.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . SITE_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );
+}
+?>
+</ul><br>
+
+<h2>Recent Draft Rants</h2>
+<ul class="historic">
+<?php
+$rants = $mtdb->getAll('SELECT distinct rant.id,UNIX_TIMESTAMP(rant.published) as date,rant.title,contributor.name from rant,contributor where rant.author=contributor.id AND rant.status=\'draft\' ORDER BY rant.published DESC limit 5');
+
+foreach($rants as $k=>$v) {
+	printf( '<li>%d: <a href="%s/edit-rant.php?rant_id=%d">%s</a> by %s, %s ago</li>', $v->id, SITE_HOST . ADMIN_PATH, $v->id, htmlspecialchars($v->title), htmlspecialchars($v->name), human_time_diff($v->date) );
+}
+?>
+</ul>
+
+<?php
+adminfooter();
+?>
diff --git a/login.php b/login.php
new file mode 100644
index 0000000..b081fc6
--- /dev/null
+++ b/login.php
@@ -0,0 +1,97 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+/* Megatokyo admin system assumes that everyone has equivilent 
+   ability to create and alter content. There are no permission
+   levels or access controls other than "Can they login?" */
+
+$error = '';
+switch( $_REQUEST['action'] ) {
+
+	case 'logout':
+		mt_clearcookie();
+		_redirect( ADMIN_PATH .'/login.php?loggedout=true' );
+
+	case 'login':
+		$log = $_POST['log'];
+		$pwd = $_POST['pwd'];
+		
+		if( mt_login( $log, $pwd )) {
+			//logthis ( "AUTH: Successful login from $log at " . $_SERVER["REMOTE_ADDR"], false );
+			adminlog("User ".$log." has logged in from ".$_SERVER['REMOTE_ADDR'], MTS_LOGIN, MTA_CHANGE);
+			// correct password
+			// set cookie
+			mt_setcookie($log, $pwd, false, ADMIN_PATH, isset($_POST['rememberme']) );
+			if($_POST['redirect_to']) _redirect( $_POST['redirect_to'] );
+			_redirect( ADMIN_PATH .'/' );
+		} else {
+			//logthis ('AUTH: Failed login attempt from ' . $_SERVER["REMOTE_ADDR"], var_export( $_REQUEST, true ) );
+		}
+		// incorrect username or password, fall through to error display		
+	
+	case 'error':
+	default:
+	
+		if (  !empty($_COOKIE[USER_COOKIE]) && mt_login($_COOKIE[USER_COOKIE], $_COOKIE[PASS_COOKIE], true) ) {
+			// Already logged in, redirect to admin dashboard.
+			nocache_headers();
+			_redirect( ADMIN_PATH .'/' );
+		}
+	
+		if( $_GET['loggedout'] == true ) $error.='<p>Successfully logged you out.</p>';
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US" xml:lang="en-US">
+<head>
+	<title>Megatokyo Admin &rsaquo; Login</title>
+	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+	<meta name="generator" content="Alan J Castonguay, Robert Sherby, Jeremy Wagner-Kaiser, Shawn Morford (!! nathanbp, jrl !!)" />
+	<link rel="stylesheet" href="wp-admin.css" type="text/css" />
+	<!--[if IE]><style type="text/css">#login h1 a { margin-top: 35px; } #login ul { padding-bottom: 65px; }</style><![endif]--><!-- Curse you, IE! -->
+	<script type="text/javascript">
+		function focusit() {
+			document.getElementById('user_login').focus();
+		}
+		window.onload = focusit;
+	</script>
+</head>
+<body class="login">
+
+<div id="login"><h1><a href="<?php echo SITE_HOST.SITE_PATH; ?>">Megatokyo Admin</a></h1>
+		<?php
+			if ( $error ) echo "<div id=\"login_error\">$error</div>\n";
+		?>
+		<form name="loginform" id="loginform" action="login.php" method="post">
+			<?php if($_GET['redirect_to']) {
+				echo '<input type="hidden" name="redirect_to" value="' . htmlentities($_GET['redirect_to'])  . '" />';
+			} ?>
+			<p>
+			<label>Username:<br/>
+			<input type="text" name="log" id="user_login" class="input" value="" size="20" tabindex="10" /></label>
+			</p>
+			<p>
+			<label>Password:<br/>
+			<input type="password" name="pwd" id="user_pass" class="input" value="" size="20" tabindex="20" /></label>
+			</p>
+			<hr/>
+			<p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="90" /> Remember me</label></p>
+			<p class="submit">
+				<input type="submit" name="submit" id="submit" value="Login &raquo;" tabindex="100" />
+				<input type="hidden" name="action" value="login" />
+			</p>
+		</form></div>
+		
+		<ul>
+			<li><a href="<?php echo SITE_HOST.SITE_PATH; ?>" title="Return to the public Megatokyo website.">Back to Megatokyo Website</a></li>
+		</ul>
+		
+		</body>
+		</html>
+		<?php
+		die();
+		
+} // end switch
+
+
+?>
diff --git a/manage-comics.php b/manage-comics.php
new file mode 100644
index 0000000..05596cb
--- /dev/null
+++ b/manage-comics.php
@@ -0,0 +1,74 @@
+<?php
+
+/* This page displays a list of comics, 15 per page. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Manage Comics');
+adminmenu();
+?>
+<h2>Edit Comic</h2>
+
+<?php
+
+$page = 1;
+if( isset($_GET['page'] )) $page = (int) $_GET['page'];
+
+$perpage = 15;
+$start = ($page-1) * $perpage;
+
+$total = ceil( $mtdb->getOne("SELECT count(DISTINCT id) FROM strip") / $perpage );
+$strips = $mtdb->getAll("SELECT id, UNIX_TIMESTAMP(published) as published, type, media, title, book, page FROM strip GROUP BY id ORDER BY id DESC LIMIT $start,$perpage");
+$types_db = $mtdb->getAll("SELECT id,description FROM strip_t");
+
+$type = array();
+foreach( $types_db as $k ) $type[$k->id]=$k->description;
+
+
+pagination( $page, $total );
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Strip #</th>
+	<th scope="col">Title</th>
+	<th scope="col">Published On</th>
+	<th scope="col">Type</th>
+	<th scope="col">Book Page #</th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $strips as $s ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="comic-<?php echo $s->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->id; ?></th>
+		 <td><?php echo $s->title;	 ?></td>
+		 <td><?php echo htmlentities( date( 'Y-m-d H:i:s', $s->published)); ?></td>
+		 <td><?php echo $type[$s->type]; ?></td>
+		 <td><?php echo $s->book; ?> - <?php echo $s->page; ?></td>
+		 <td style="text-align: center;"><a href="<?php echo SITE_HOST . SITE_PATH; ?>/strip/<?php echo $s->id; ?>">View</a></td>
+		 <td style="text-align: center;"><a href="edit-comic.php?strip_id=<?php echo $s->id; ?>">Edit</a></td>
+		 <td style="text-align: center;"><a class="delete" href="delete-comic.php?strip_id=<?php echo $s->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+
+<?php
+adminfooter();
+?>
diff --git a/manage-metatypes.php b/manage-metatypes.php
new file mode 100644
index 0000000..ea01b73
--- /dev/null
+++ b/manage-metatypes.php
@@ -0,0 +1,106 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+if( isset($_GET['delete']) && (int)$_GET['delete'] ) {
+	check_nonce('delete-metatype-'.(int)$_GET['delete']);
+	if(! $mtdb->query( 'DELETE FROM meta_t WHERE id=' . (int)$_GET['delete'] ) )
+	{
+		adminlog("Error on deleting metatype ".(int)$_GET['delete'], MTS_TYPE_META, MTA_DELETE, E_WARNING);
+		mtdie("Error on update: ". htmlentities(mysql_error()));
+	}
+	$info.='<p>Deleted metatype successfully.<p>';
+	adminlog("Metatype ".(int)$_GET['delete']." deleted.", MTS_TYPE_META, MTA_DELETE);
+}
+
+if( isset($_POST['action']) && $_POST['action'] == 'new_meta' ) {
+	check_nonce('new-metatype');
+	
+	$name = trim($_POST['name']);
+	
+	if( check_type_name( $name ) ) {
+		if(! $mtdb->query( 'INSERT INTO meta_t(name) VALUES("'. mysql_real_escape_string($name) . '")' ) )
+		{
+			adminlog("Error on inserting metatype ".(int)$_GET['delete'], MTS_TYPE_META, MTA_INSERT, E_WARNING);
+			mtdie("Error on insertion: ". htmlentities(mysql_error()));
+		}
+	}
+	$info.='<p>New metatype created successfully.<p>';
+	adminlog("Metatype ".$name." added.", MTS_TYPE_META, MTA_ADD);
+}
+
+if( isset($_POST['action']) && $_POST['action'] == 'edit_meta' ) {
+	check_nonce('save-metatype-'.(int)$_POST['type_id']);
+	
+	$name = trim($_POST['name']);
+	
+	if( check_type_name( $name ) ) {
+		if(! $mtdb->query( 'UPDATE meta_t SET name = "' . mysql_real_escape_string($name) . '" WHERE id=' . (int)$_POST['type_id']) )
+		{
+			adminlog("Error updating metatype ".(int)$_GET['delete'], MTS_TYPE_META, MTA_UPDATE, E_WARNING);
+			mtdie("Error on update: ". htmlentities(mysql_error()));
+		}
+	}
+	$info.='<p>Changes to metatype saved successfully.<p>';
+	adminlog("Metatype ".$name." updated.", MTS_TYPE_META, MTA_UPDATE);
+}
+
+//get all metatypes
+$metas = $mtdb->getAll("SELECT id, name FROM meta_t");
+
+adminhead('Metatypes');
+adminmenu();
+?>
+<h2>Metatype Management</h2>
+<p>Make changes to the metatypes which organize the types.</p>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Metatype #</th>
+	<th scope="col">Name</th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $metas as $s ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="type-<?php echo $s->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->id; ?></th>
+		 <td><?php echo htmlentities($s->name); ?></td>
+		 <td style="text-align: center;"><a href="edit-metatype.php?edit=<?php echo (int)$s->id; ?>">Edit</a></td>
+		 <td style="text-align: center;"><a class="delete" href="?delete=<?php echo (int)$s->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+<form enctype="multipart/form-data" name="create-user" id="create-user" action="manage-metatypes.php" method="post">
+<?php nonce_field('new-metatype'); ?>
+<input type="hidden" name="action" value="new_meta" />
+
+<h2>Create New Metatype</h2>
+<div class="narrow">
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Name</th>
+	<td width="66%"><input name="name" type="text" id="name" value="" /></td>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Create &raquo;" name="submit" /></p>
+</div>
+</form>
+
+<?php
+adminfooter();
+?>
\ No newline at end of file
diff --git a/manage-pages.php b/manage-pages.php
new file mode 100644
index 0000000..d3ecebf
--- /dev/null
+++ b/manage-pages.php
@@ -0,0 +1,67 @@
+<?php
+
+/* This page displays a list of comics, 15 per page. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Manage Pages');
+adminmenu();
+?>
+<h2>Manage Pages</h2>
+
+<?php
+
+$page = 1;
+if( isset($_GET['page'] )) $page = (int) $_GET['page'];
+
+$perpage = 15;
+$start = ($page-1) * $perpage;
+
+$total = ceil( $mtdb->getOne("SELECT count(DISTINCT url_name) FROM static_page") / $perpage );
+$pages = $mtdb->getAll("SELECT url_name, pubdate, status, title, body FROM static_page ORDER BY url_name ASC LIMIT $start,$perpage");
+
+pagination( $page, $total );
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Page&nbsp;Name</th>
+	<th scope="col">Title</th>
+	<th scope="col">Status</th>
+	<th scope="col">Published&nbsp;On</th>
+	<th scope="col">Excerpt</th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $pages as $p ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="page-<?php echo $p->url_name; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $p->url_name ?></th>
+		 <td><?php echo $p->title; ?></td>
+		 <td><?php echo $p->status; ?></td>
+		 <td><?php echo $p->pubdate; ?></td>
+		 <td><?php echo Excerpt($p->body,185); ?></td>
+		 <td><?php echo '<a href="' . SITE_HOST.SITE_PATH.'/' . $p->url_name . '">View</a>'; ?></td>
+		 <td style="text-align: center;"><a href="edit-page.php?page_name=<?php echo $p->url_name; ?>">Edit</a></td>
+		 <td style="text-align: center;"><a class="delete" href="delete-page.php?page_name=<?php echo $p->url_name; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+<?php
+adminfooter();
+?>
diff --git a/manage-rants.php b/manage-rants.php
new file mode 100644
index 0000000..80edd37
--- /dev/null
+++ b/manage-rants.php
@@ -0,0 +1,69 @@
+<?php
+
+/* This page displays a list of comics, 15 per page. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Manage Rants');
+adminmenu();
+?>
+<h2>Manage Rants</h2>
+
+<?php
+
+$page = 1;
+if( isset($_GET['page'] )) $page = (int) $_GET['page'];
+
+$perpage = 15;
+$start = ($page-1) * $perpage;
+
+$total = ceil( $mtdb->getOne("SELECT count(DISTINCT id) FROM rant") / $perpage );
+$rants = $mtdb->getAll("SELECT r.id,UNIX_TIMESTAMP(r.published) AS published,c.name,r.title,r.body, r.status FROM rant r,contributor c WHERE c.id=r.author GROUP BY id ORDER BY id DESC LIMIT $start,$perpage");
+
+pagination( $page, $total );
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Rant&nbsp;#</th>
+	<th scope="col">Author</th>
+	<th scope="col">Title</th>
+	<th scope="col">Status</th>
+	<th scope="col">Published&nbsp;On</th>
+	<th scope="col">Excerpt</th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $rants as $r ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="rant-<?php echo $r->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $r->id; ?></th>
+		 <td><?php echo $r->name; ?></td>
+		 <td><?php echo $r->title; ?></td>
+		 <td><?php echo $r->status; ?></td>
+		 <td><?php echo htmlentities( date( 'Y-m-d H:i:s', $r->published)); ?></td>
+		 <td><?php echo Excerpt($r->body,185); ?></td>
+		 <td><?php echo '<a href="' . SITE_HOST.SITE_PATH.'/rant/' . $r->id . '">View</a>'; ?></td>
+		 <td style="text-align: center;"><a href="edit-rant.php?rant_id=<?php echo $r->id; ?>">Edit</a></td>
+		 <td style="text-align: center;"><a class="delete" href="delete-rant.php?rant_id=<?php echo $r->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+<?php
+adminfooter();
+?>
diff --git a/manage-statusbox.php b/manage-statusbox.php
new file mode 100644
index 0000000..c943f2e
--- /dev/null
+++ b/manage-statusbox.php
@@ -0,0 +1,167 @@
+<?php
+
+/* This page displays and modifies the Status Box */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+
+
+
+/* Handle form submission of new updates */
+
+function handle_update_form() {
+	global $error,$info,$mtdb;
+
+	check_nonce('update-statusbox');
+	$percent = $_POST['update_percentage'];
+	$eta = strtotime($_POST['update_eta']);
+	$text = $_POST['update_text'];
+
+	$now = time();
+	$percent = trim($percent, "% ");
+	if( !is_numeric ( $percent ) ) {
+		$error = '<p>Percentage complete must be numeric.</p>';
+		return;
+	}
+	if( $percent < 0 || $percent > 100 ) {
+		$error = '<p>Supply percentages between 0 and 100 (inclusive), please.</p>';
+		return;
+	}
+
+	// ETA must be sane
+	if(   ($eta < $now && $percent < 100) ||  ($eta<mktime(0,0,0,1,1,2000) )  ) {
+		$error = '<p>Supply estimated time in the future, please. Current time is ' . date("F j, Y, g:i a", $now) . '</p>';
+		return;
+	}
+
+	$mtdb->query( 'INSERT INTO status (published,eta,percentage,text) VALUES( NOW(), FROM_UNIXTIME(' . (int)$eta . '), '. (int)$percent . ', "' . mysql_real_escape_string($text) . '")' );
+
+	$_POST['update_percentage']=$_POST['update_eta']=$_POST['update_text']='';
+	$info = '<p>Statusbox updated successfully.</p>';
+}
+
+if( isset($_POST['action']) && $_POST['action'] == 'create-update' )
+	handle_update_form();
+
+
+
+
+adminhead('Status Box');
+adminmenu('manage-statusbox.php');
+
+
+/* Simple Presets, Select things said before */
+
+
+$presets = $mtdb->getAll('SELECT COUNT(*) as c, percentage, text, CONCAT( percentage, "% - ", text ) as p FROM status GROUP BY p HAVING c>1 ORDER BY c DESC');
+
+?>
+
+
+<form enctype="multipart/form-data" name="create-update" id="create-update" action="manage-statusbox.php" method="post">
+<?php nonce_field('update-statusbox'); ?>
+	<input type="hidden" name="action" value="create-update" />
+
+<h2>Update Status Box</h2>
+<div class="narrow">
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+
+	<tr>
+	<th scope="row">Current Time</th>
+	<td width="66%"><?php echo date("F j, Y, g:i a"); ?></td>
+	</tr>
+
+	<tr>
+	<th scope="row">Estimated Time Of Next Update</th>
+	<td width="66%"><input name="update_eta" type="text" id="update_eta" value="<?php echo htmlentities($_POST['update_eta']); ?>" /></td>
+	</tr>
+
+	<tr>
+	<th scope="row">Percentage Complete</th>
+	<td width="66%"><input name="update_percentage" type="text" id="update_percentage" value="<?php echo htmlentities($_POST['update_percentage']); ?>" /></td>
+	</tr>
+
+	<tr>
+	<th scope="row">Status Description</th>
+	<td width="66%"><textarea name="update_text" row="6" cols="30" id="update_text"><?php echo htmlentities($_POST['update_text']); ?></textarea></td>
+	</tr>
+	
+	<script type="text/javascript">
+	function PresetHandler( f ) {
+		
+		var i = f.preset.selectedIndex;
+		var v = f.preset.options[i].value;
+		
+		var parts = v.split("% - ");
+		
+		if( parts[0] == undefined ) {
+			parts[0] = "";
+		}
+		if( parts[1] == undefined ) {
+			parts[1] = "";
+		}
+		
+		f.update_percentage.value = parts[0];
+		f.update_text.value = parts[1];
+		
+		return true;
+	}
+	document.write('<tr><th scope="row">Presets</th><td width="66%"><select name="preset" onchange="PresetHandler(this.form);"><option value="">-none-</option><?php
+		foreach( $presets as $p )
+			echo '<option value="' . addslashes(htmlentities($p->p)) . '">' . addslashes(htmlentities($p->p)) . '</option>';
+	?></select></td></tr>');
+	
+	</script>
+	</table>
+
+	<p class="submit"><input type="submit" value="Set Update Status &raquo;" name="submit" /></p>
+</div>
+</form>
+
+
+</div>
+<div class="wrap">
+
+<h2>Status Box History</h2>
+<p>Status updates that have gone before.</p>
+
+<?php
+
+$stats = $mtdb->getAll("SELECT published,eta,percentage,text FROM status ORDER BY published DESC limit 5");
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col">Published</th>
+	<th scope="col">ETA</th>
+	<th scope="col">Percentage</th>
+	<th scope="col">Text</th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $stats as $s ) {
+		$alternate=!$alternate;
+		?>
+		<tr <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->published; ?></th>
+		 <td><?php echo $s->eta; ?></td>
+		 <td><?php echo $s->percentage; ?></td>
+		 <td><?php echo htmlentities($s->text); ?></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+<?php
+adminfooter();
+?>
diff --git a/manage-twitter-presets.php b/manage-twitter-presets.php
new file mode 100644
index 0000000..2177400
--- /dev/null
+++ b/manage-twitter-presets.php
@@ -0,0 +1,84 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+
+if( isset($_REQUEST['action']) && 'edit_twitter' == $_REQUEST['action']) {
+	check_nonce('edit-twitter');
+	foreach(array_keys($_REQUEST) as $k) {
+		if(0 !== strpos($k, 'id_'))
+			continue;
+
+		$id = (int) $_REQUEST[$k];
+		$position = (int) $_REQUEST["position_$id"];
+		$msg = $_REQUEST["message_$id"];
+
+		if(0 == $id && !empty($msg)) {
+			// Add a new preset
+			$mtdb->query( sprintf('INSERT INTO twitter_status (position, message) VALUES (%d, "%s")', $position, mysql_real_escape_string($msg)) );
+			adminlog("Added new preset: $msg", MTS_TWITTER, MTA_ADD);
+		} elseif(empty($msg)) {
+			// Delete an existing preset
+			$mtdb->query( "DELETE FROM twitter_status WHERE id = $id" );
+			adminlog("Removed preset: $id", MTS_TWITTER, MTA_ADD);
+		} else {
+			// Modify an existing preset
+			$mtdb->query( sprintf('UPDATE twitter_status SET position = %d, message = "%s" WHERE id = %d', $position, mysql_real_escape_string($msg), $id) );
+		}
+	}
+}
+
+$statuses = $mtdb->getAll('SELECT id, position, message FROM twitter_status ORDER BY position, id');
+
+adminhead('Manage Twitter Presets');
+adminmenu();
+
+?>
+
+<h2>Manage Twitter Presets</h2>
+<p>To add a new preset, enter it into the empty box below.</p>
+<p>To delete a preset, remove all text from its message box.</p>
+
+<p><a href="post-twitter.php">&lt;- Done</a></p>
+
+<form method="post" action="manage-twitter-presets.php">
+<?php nonce_field('edit-twitter'); ?>
+<input type="hidden" name="action" value="edit_twitter" />
+
+<table class="widefat">
+	<thead>
+		<tr>
+		<th scope="col" style="width:2em">ID</th>
+		<th scope="col" style="width:4em">Order</th>
+		<th scope="col">Message</th>
+		</tr>
+	</thead>
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach($statuses as $k=>$v) {
+		$alternate = !$alternate;
+		?>
+		<tr <?php if($alternate) echo 'class="alternate"' ?>>
+		 <td style="text-align:center"><input type="hidden" name="id_<?php echo $v->id ?>" value="<?php echo $v->id ?>" /><?php echo $v->id ?></td>
+		 <td><input type="text" size="3" name="position_<?php echo $v->id ?>" value="<?php echo $v->position ?>" /></td>
+		 <td><input type="text" style="width:95%" maxlength="140" name="message_<?php echo $v->id ?>" value="<?php echo $v->message ?>" /></td>
+		</tr>
+		<?php
+	}
+	?>
+	<tr <?php if(!$alternate) echo 'class="alternate"' ?>>
+	 <td style="text-align:center"><input type="hidden" name="id_0" value="0" /></td>
+	 <td><input type="text" size="3" name="position_0" value="" /></td>
+	 <td><input type="text" style="width:95%" maxlength="140" name="message_0" value="" /></td>
+	</tr>
+	</tbody>
+</table>
+<p style="padding-bottom:1em;"><input type="submit" value="Save" /></p>
+</form>
+
+<?php
+adminfooter();
+?>
diff --git a/manage-twitter-users.php b/manage-twitter-users.php
new file mode 100644
index 0000000..8e14058
--- /dev/null
+++ b/manage-twitter-users.php
@@ -0,0 +1,156 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+if( isset($_POST['action']) && $_POST['action'] == 'new' ) {
+	check_nonce('new-twitter-user');
+	
+	if(! $mtdb->query( sprintf('INSERT INTO twitter_user(username) VALUES("%s")', mysql_real_escape_string( md5( microtime() )) ) ) ) {
+		adminlog("Error on insertion of new twitter user.", MTS_TWITTER, MTA_INSERT, E_WARNING);
+		mtdie("Error on insertion of new twitter user: ". htmlentities(mysql_error()), 'SQL Error');
+	} else {
+		//$name = sanitize_username($_POST['name']);
+		
+		$id = mysql_insert_id();
+		
+		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET);
+		$request_token = $connection->getRequestToken(OAUTH_CALLBACK . "&id=$id");
+		
+		if ($connection->http_code !== 200 ) {
+			adminlog("Twitter getRequestToken failed. HTTP code: $connection->http_code", MTS_TWITTER, MTA_MODIFY);
+			mtdie("Could not connect to twitter.com.");
+		}
+		
+		echo $id . '<br/>';
+		
+		setOAuthTokens( $id, $request_token['oauth_token'], $request_token['oauth_token_secret'], md5(microtime()) );
+			
+		adminlog("New twitter user created successfully.", MTS_TWITTER, MTA_ADD);
+
+		$url = $connection->getAuthorizeURL($request_token['oauth_token']);
+		//echo $url;
+		_redirect($url);
+		exit();	
+		
+	}
+}
+
+if( isset($_REQUEST['action']) && $_REQUEST['action'] == 'twittercallback' && isset($_REQUEST['id'])) {
+	# twitter userID = ID
+	$id = (int)$_REQUEST['id'];
+	$row = $mtdb->getRow( sprintf('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user WHERE id=%d LIMIT 1', $id));
+	
+	# Compare token in database with token from twitter. If they differ, bail.
+	if( $row->oauth_token != $_REQUEST['oauth_token'] ) {
+		# token is old, drop from database
+		if(!$mtdb->query("DELETE FROM twitter_user WHERE id = '$id'") ) {
+			adminlog('Error deleting temporary twitter user ' . $id, MTS_TWITTER, MTA_DELETE, E_ERROR);
+			mtdie('Error deleting temporary twitter user.', 'SQL Error');
+		}
+		$error.='<p>OAuth Token are Old</p>';
+	} else {
+		# token is good, save the new Access Token to the database
+		$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $row->oauth_token, $row->oauth_token_secret);
+				
+		$access_token = $connection->getAccessToken($_REQUEST['oauth_verifier']);
+		
+		if (200 == $connection->http_code) {
+			# successful
+			$info.='<p>Successfully obtained OAuth Access Token.</p>';
+			$content = $connection->get('account/verify_credentials');
+			$username = $content->screen_name;
+
+			setOAuthTokens($id, $access_token['oauth_token'], $access_token['oauth_token_secret'], $username);
+			adminlog("Successfully received OAuth Access Tokens for twitter user.", MTS_TWITTER, MTA_MODIFY, E_WARNING);
+
+			//print_r($content);
+			
+		} else {
+			# fail
+			if( !$mtdb->query("DELETE FROM twitter_user WHERE id = '$id'") ) {
+				adminlog('Error deleting specified twitter user ' . $id, MTS_TWITTER, MTA_DELETE, E_ERROR);
+				mtdie('Error deleting the specified twitter user.', 'SQL Error');
+			}
+			$info.='<p>Failed to get OAuth Access Token for ' . $username . '.</p>';
+			adminlog("Failed to get OAuth Access Tokens for twitter user.", MTS_TWITTER, MTA_MODIFY, E_ERROR);
+		}
+		
+	}
+}
+
+$twitter_users = $mtdb->getAll('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user ORDER BY username');
+
+adminhead('Manage Twitter Users');
+adminmenu();
+
+?>
+
+<h2>Manage Twitter Users</h2>
+<p>Make changes to the twitter accounts which we can post to.</p>
+
+<p><a href="post-twitter.php">&lt;- Done</a></p>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">ID #</th>
+	<th scope="col">Twitter.com Username</th>
+	<th scope="col">oauth_token</th>
+	<th scope="col">oauth_token_secret</th>
+	<th scope="col">Authorized</th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $twitter_users as $s ) {
+		$alternate=!$alternate;
+		
+		?>
+		<tr id="twitteruser-<?php echo $s->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->id; ?></th>
+		 <td><?php echo htmlentities($s->username); ?></td>
+		 <td><?php echo htmlentities($s->oauth_token); ?></td>
+		 <td><?php echo htmlentities($s->oauth_token_secret); ?></td>
+		 <td><?php 
+			$connection = new TwitterOAuth(CONSUMER_KEY, CONSUMER_SECRET, $s->oauth_token, $s->oauth_token_secret);
+			$content = $connection->get('account/verify_credentials');
+			if( isset($content->profile_image_url)) {
+				echo '<img src="' . $content->profile_image_url . '" />';
+			} else {
+				echo 'Not Authorized';
+			}
+		 ?></td>
+		 <td style="text-align: center;"><a class="delete" href="delete-twitter-user.php?id=<?php echo (int)$s->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+<form enctype="multipart/form-data" name="create-user" id="create-user" action="manage-twitter-users.php" method="post">
+<?php nonce_field('new-twitter-user'); ?>
+<input type="hidden" name="action" value="new" />
+
+<h3>Add Twitter User</h3>
+<!-- <div class="narrow">
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Username</th>
+	<td width="66%">@<input name="name" type="text" id="name" value="" /></td>
+	</tr>
+	</table>
+-->
+	<p class="submit"><input type="submit" value="Add Twitter User &raquo;" name="submit" /></p>
+<!-- </div> -->
+</form>
+
+<?php
+adminfooter();
+?>
diff --git a/manage-types.php b/manage-types.php
new file mode 100644
index 0000000..cf493fa
--- /dev/null
+++ b/manage-types.php
@@ -0,0 +1,179 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+if( isset($_GET['delete'])  && (int)$_GET['delete'] ) {
+	check_nonce('delete-type-' . (int)$_GET['delete']);
+	if(! $mtdb->query( 'DELETE FROM strip_t WHERE id=' . (int)$_GET['delete'] ) )
+	{
+		adminlog("Error deleting type ".(int)$_GET['delete'], MTS_TYPE, MTA_DELETE, E_WARNING);
+		mtdie("Error on deletion of existing type: " . htmlentities(mysql_error()), 'SQL Error');
+	}
+	if(! $mtdb->query( 'DELETE FROM meta WHERE type=' . (int)$_GET['delete'] ) )
+	{
+		adminlog("Error on deletion of type ".(int)$_GET['delete']."'s metadata.", MTS_TYPE, MTA_DELETE, E_WARNING);
+		mtdie("Error on deletion of existing type's metadata: " . htmlentities(mysql_error()), 'SQL Error');
+	}
+	$info.='<p>Deleted type successfully.<p>';
+	adminlog("Deleted type ".(int)$_GET['delete'], MTS_TYPE, MTA_DELETE);
+}
+
+if( isset($_POST['action']) && $_POST['action'] == 'new_type' ) {
+	check_nonce('new-type');
+	
+	$name = trim($_POST['name']);
+	$desc = trim($_POST['description']);
+	
+	if( check_type_name($name) ) {
+		if(! $mtdb->query( sprintf( 'INSERT INTO strip_t(name, description) VALUES("%s", "%s")', mysql_real_escape_string($name), mysql_real_escape_string($desc)) ) )
+		{
+			adminlog("Error on insertion of new type.", MTS_TYPE, MTA_INSERT, E_WARNING);
+			mtdie("Error on insertion of new type: ". htmlentities(mysql_error()), 'SQL Error');
+		}
+	}
+	$info.='<p>New type created successfully.<p>';
+	adminlog("Type '".$name."' created successfully.", MTS_TYPE, MTA_ADD);
+}
+
+if( isset($_POST['action']) && $_POST['action'] == 'edit_type' ) {
+	
+	$id = (int)$_POST['type_id'];
+	check_nonce("save-type-$id");
+
+	$name = trim($_POST['name']);
+	$desc = trim($_POST['description']);
+	
+	$meta = $_POST['meta'];
+
+	$m_delete = $mtdb->getAll("SELECT meta FROM meta WHERE type = $id");
+		
+	$m_insert = array();
+	
+	// Key listed in both Insert and Delete lists, so remove from both == Do Nothing	
+	foreach( $m_delete as $k=>$v ) {		
+		if( array_key_exists( $v->meta, $meta ) ) {
+			unset($m_delete[$k]);
+			unset($meta[$v->meta]);
+		} else {
+			$m_delete[$k] = 'meta=' . (int)$v->meta;
+		}		
+	}
+
+	// Key listed only in Insert list, make proper format
+	foreach( $meta as $k=>$v ) {
+		$m_insert[] = "($id," . (int)$k . ')';
+	}
+
+	if( check_type_name( $name ) ) {
+		if( !$mtdb->query( sprintf( 'UPDATE strip_t SET name = "%s", description = "%s" WHERE id = %s', mysql_real_escape_string($name), mysql_real_escape_string($desc), $id)) )
+		{
+			adminlog("Error on updating type ".$id, MTS_TYPE, MTA_UPDATE, E_WARNING);
+			mtdie("Error on update of existing type: ". htmlentities(mysql_error()), 'SQL Error');
+		}
+			
+		$sql_insert = "INSERT INTO meta (type,meta) VALUES " . implode(',',$m_insert);
+		$sql_delete = "DELETE FROM meta WHERE type=$id AND ( " . implode(' OR ',$m_delete) . ' )';
+
+		$mtdb->query('START TRANSACTION');
+		
+		if( count($m_insert) )
+			if(! $mtdb->query( $sql_insert ) )
+			{
+				adminlog("Error inserting new metatype association data for type ".$id, MTS_TYPE, MTA_INSERT, E_WARNING);
+				mtdie("There was an error inserting new metatype association data. Transaction aborted. $sql_insert");
+			}
+		if( count($m_delete) )
+			if(! $mtdb->query( $sql_delete ) )
+			{
+				adminlog("Error deleting old metatype association data for type ".$id, MTS_TYPE, MTA_REMOVE, E_WARNING);
+				mtdie("There was an error deleting old metatype data. Transaction aborted. $sql_delete");
+			}
+			
+		$mtdb->query('COMMIT');
+		
+	} else {
+		$error.='<p>Invalid type name!</p>';
+	}
+	$info.='<p>Changes to type saved successfully.<p>';
+	adminlog("Type ".$id." updated.", MTS_TYPE, MTA_UPDATE);
+}
+
+//display all types
+$types = $mtdb->getAll("SELECT strip_t.id AS id, strip_t.name AS name, strip_t.description AS description, COUNT(strip.id) AS strips FROM strip_t LEFT JOIN strip ON strip.type = strip_t.id GROUP BY strip_t.id");
+
+adminhead('Types');
+adminmenu();
+
+?>
+
+<h2>Type Management</h2>
+<p>Make changes to the types which categorize the comics.</p>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Type #</th>
+	<th scope="col">Name</th>
+	<th scope="col">Description</th>
+	<th scope="col">Strips</th>
+	<th scope="col">Metatypes</th>
+	<th scope="col"></th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $types as $s ) {
+		$alternate=!$alternate;
+		
+		$metas = $mtdb->getAll("SELECT meta_t.name AS name FROM strip_t
+			JOIN meta ON meta.type = strip_t.id JOIN meta_t ON meta.meta = meta_t.id
+			WHERE strip_t.id = $s->id");
+			
+		$meta = implode(', ',  array_map('_getMetaNameFromObject', $metas) );
+		
+		?>
+		<tr id="comic-<?php echo $s->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->id; ?></th>
+		 <td><?php echo htmlentities($s->name); ?></td>
+		 <td><?php echo htmlentities($s->description); ?></td>
+		 <td><?php echo $s->strips ?></td>
+		 <td><?php echo htmlentities($meta); ?> </td>
+		 <td style="text-align: center;"><a href="edit-type.php?edit=<?php echo (int)$s->id; ?>">Edit</a></td>
+		 <td style="text-align: center;"><a class="delete" href="?delete=<?php echo (int)$s->id; ?>">Delete</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+<form enctype="multipart/form-data" name="create-user" id="create-user" action="manage-types.php" method="post">
+<?php nonce_field('new-type'); ?>
+<input type="hidden" name="action" value="new_type" />
+
+<h2>Create New Type</h2>
+<div class="narrow">
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Name</th>
+	<td width="66%"><input name="name" type="text" id="name" value="" /></td>
+	</tr>
+	<tr>
+	<th scope="row" width="33%">Description</th>
+	<td width="66%"><input name="description" type="text" id="description" value="" /></td>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Create &raquo;" name="submit" /></p>
+</div>
+</form>
+
+<?php
+adminfooter();
+?>
diff --git a/post-comic.php b/post-comic.php
new file mode 100644
index 0000000..1af94a0
--- /dev/null
+++ b/post-comic.php
@@ -0,0 +1,103 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+$last_type = $mtdb->getOne( 'SELECT type FROM strip ORDER BY id DESC limit 1' );
+$last_strip_id = $mtdb->getOne( 'SELECT MAX(id) FROM strip' );
+
+adminhead('Post Comic');
+adminmenu('post-comic.php');
+
+$tomorrow = strtotime('tomorrow');
+$post_date = time();
+
+if(isset($_REQUEST['next']) && $_REQUEST['next'] == "yes")
+{
+	//in general, this is the case that is desired
+	//	the next monday, wednesday, or friday that isn't today
+	$post_date = min( strtotime("next Monday +1 hour", $tomorrow), strtotime("next Wednesday +1 hour", $tomorrow), strtotime("next Friday +1 hour", $tomorrow) );
+	
+	//however, if it is monday, wednesday, or friday AND before 1 AM
+	// then we want to post at 1 AM on this day
+	$today = date("l");
+	if(($today == "Monday" || $today == "Wednesday" || $today == "Friday") && date("G") == 0)
+	{
+		$post_date = "today +1 hour";
+	}
+}
+
+?>
+
+<h2>Post New Comic</h2>
+
+<form enctype="multipart/form-data" action="edit-comic.php" method="post" name="post" id="post">
+<?php nonce_field('new-strip'); ?>
+<input type="hidden" name="action" value="new_comic" />
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="slugdiv" class="dbx-box">
+<h3 class="dbx-handle">Comic Type</h3>
+<div class="dbx-content"><select name="strip_type">
+<?php
+$types = $mtdb->getAll( 'SELECT id, description FROM strip_t ORDER BY id' );
+foreach( $types as $k=>$v )
+	printf('<option value="%s" %s>%s</option>', htmlentities($v->id), ($last_type == $v->id ? 'selected="selected"' : '' ), $v->description);
+?>
+</select></div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Post Date</h3>
+<div class="dbx-content"> <input type="text" name="strip_date" value="<?php echo date('Y-m-d H:i:s', $post_date); ?>" /> </div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Strip Number</h3>
+<div class="dbx-content"> <input type="text" name="strip_new_id" size="6" value="<?php echo $last_strip_id + 1; ?>" id="strip_id" /> </div>
+</fieldset>
+
+<fieldset id="stripdiv" class="dbx-box">
+<h3 class="dbx-handle">Upload Comic</h3>
+<div class="dbx-content">
+	<input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
+	<input name="comicFile" type="file" tabindex="2" size="12" />
+</div>
+</fieldset>
+
+<fieldset id="bookpagenumberdiv" class="dbx-box">
+	<h3 class="dbx-handle">Book Page Number</h3>
+	<div class="dbx-content"> <input type="text" name="book" size="3" value="" />-<input type="text" name="page" size="4" value=""/> </div>
+</fieldset>
+
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="strip_title" size="40" tabindex="1" value="" id="title" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Transcript</legend>
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="27" cols="40" name="content" tabindex="3" id="content"></textarea></div>
+</fieldset>
+
+<p class="submit">
+ <input name="post_comic" type="submit" id="post_comic" tabindex="4" accesskey="p" value="Post Comic" />
+</p>
+
+</div>
+</form>
+<?php
+adminfooter();
+?>
diff --git a/post-page.php b/post-page.php
new file mode 100644
index 0000000..8b3d66c
--- /dev/null
+++ b/post-page.php
@@ -0,0 +1,104 @@
+<?php
+
+/* This is a blank form for new pages to be started.
+It does not read past page information.
+Some fields will be prefilled based on current author. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Write Static Page');
+adminmenu('post-page.php');
+
+?>
+<script language="javascript" type="text/javascript" src="include/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "exact",
+	elements: "content",
+	theme : "advanced",
+	theme_advanced_buttons1 : "bold,italic,underline,separator,strikethrough,justifyleft,justifycenter,justifyright,justifyfull,bullist,numlist,undo,redo,link,unlink,code,formatselect",
+	theme_advanced_buttons2 : "",
+	theme_advanced_buttons3 : "",
+	theme_advanced_toolbar_location : "top",
+	theme_advanced_toolbar_align : "left",
+	theme_advanced_path_location : "bottom",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	theme_advanced_blockformats : "p,h3,h4,h5,h6"
+});
+</script>
+<h2>Create New Page</h2>
+
+<form enctype="multipart/form-data" action="edit-page.php" method="post" name="post" id="post">
+<?php nonce_field('new-page'); ?>
+<input type="hidden" name="action" value="new_page" />
+
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="pagenamediv" class="dbx-box">
+<h3 class="dbx-handle">Page URL Name</h3>
+<div class="dbx-content">
+	<input type="text" name="page_name" />
+</div>
+</fieldset>
+
+<fieldset id="statusdiv" class="dbx-box">
+<h3 class="dbx-handle">Published Status</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="page_status" value="draft" checked="checked"/>Draft</label>
+	<label><input type="radio" name="page_status" value="published"/>Published</label>
+</div>
+</fieldset>
+
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="title" size="40" tabindex="1" value="" id="title" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Page</legend>
+	
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="13" cols="40" name="content" tabindex="3" id="content"></textarea></div>
+</fieldset>
+
+
+<p class="submit">
+ <input name="save" type="submit" id="save" tabindex="3" value="Save and Continue Editing" style="font-weight: bold;" />
+ <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="Publish" />
+</p>
+
+
+
+<div class="dbx-b-ox-wrapper">
+
+<fieldset id="cssdivrich">
+	<legend>Optional CSS</legend>
+	
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea rows="13" cols="40" name="style" tabindex="6" id="style"></textarea></div>
+</fieldset>
+
+</div>
+
+
+</div>
+
+</form>
+
+<?php adminfooter() ?>
diff --git a/post-rant.php b/post-rant.php
new file mode 100644
index 0000000..3c1c4a8
--- /dev/null
+++ b/post-rant.php
@@ -0,0 +1,194 @@
+<?php
+
+/* This is a blank form for new rants to be started.
+It does not read past rant information.
+Some fields will be prefilled based on current author. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Write Rant');
+adminmenu('post-rant.php');
+
+$rant_image_ext = $mtdb->getOne( 'SELECT extension FROM media_t WHERE id=' . (int)$currentuser->imagetype );
+
+?>
+
+<script language="javascript" type="text/javascript" src="include/tiny_mce/tiny_mce.js"></script>
+<script language="javascript" type="text/javascript">
+tinyMCE.init({
+	mode : "textareas",
+	theme : "advanced",
+	theme_advanced_buttons1:"bold,italic,underline,strikethrough,|,bullist,numlist,blockquote,|,justifyleft,justifycenter,justifyright,justifyfull,|,link,unlink,|,image,media,charmap,|,formatselect,forecolor,removeformat,|,pastetext,pasteword,|,outdent,indent,|,undo,redo,|,code,visualchars,|,fullscreen,preview",
+	theme_advanced_buttons2:"",
+	theme_advanced_buttons3 : "",
+	plugin_preview_width : "350",
+	plugin_preview_height : "700",
+	language:"en",
+	theme_advanced_toolbar_location:"top",
+	theme_advanced_toolbar_align:"left",
+	theme_advanced_statusbar_location:"bottom",
+	theme_advanced_resizing:"1",
+	theme_advanced_resize_horizontal:"",
+	paste_convert_middot_lists:"1",
+	paste_remove_spans:"1",
+	paste_remove_styles:"1",
+	gecko_spellcheck:"1",
+	extended_valid_elements : "a[name|href|target|title|onclick],img[class|src|border=0|alt|title|hspace|vspace|width|height|align|onmouseover|onmouseout|name],hr[class|width|size|noshade],font[face|size|color|style],span[class|align|style]",
+	theme_advanced_blockformats : "p,h3,h4,h5,h6",
+	plugins:"safari,inlinepopups,autosave,paste,media,fullscreen,contextmenu,advimage,advlink,visualchars,preview"
+});
+</script>
+
+<h2>Create New Rant</h2>
+
+<form enctype="multipart/form-data" action="edit-rant.php" method="post" name="post" id="post">
+<?php nonce_field('new-rant'); ?>
+<input type="hidden" name="rant_id" value="" />
+<input type="hidden" name="action" value="new_rant" />
+
+<div id="poststuff">
+
+<div id="moremeta">
+<div id="grabit" class="dbx-group">
+
+<fieldset id="slugdiv" class="dbx-box">
+<h3 class="dbx-handle">Side</h3>
+<div class="dbx-content"><select name="rant_side">
+<?php
+  // What side does this author usually post on?
+  $usual = $mtdb->getOne( 'SELECT side,count(*) c FROM rant WHERE author=' . (int)$currentuser->id . ' GROUP BY side ORDER BY c DESC limit 1' );
+  
+  $sides = array('left'=>'Left','right'=>'Right');
+  foreach( $sides as $k=>$v ) {
+  	printf('<option value="%s" %s>%s</option>', htmlentities($k), ($usual == $k ? 'selected="selected"' : '' ), $v );
+  }
+?>
+</select></div>
+</fieldset>
+
+<fieldset id="authordiv" class="dbx-box">
+<h3 class="dbx-handle">Author</h3> 
+<div class="dbx-content"><select name="rant_author"><?php
+	$contrib = $mtdb->getAll('select id,name from contributor');
+	foreach( $contrib as $k=>$v ) {
+		printf('<option value="%s" %s>%s</option>', htmlentities($v->id), ( $currentuser->id == $v->id ? 'selected="selected"' : '' ), $v->name );
+	} ?>
+</select></div>
+</fieldset>
+
+<fieldset id="pubdatediv" class="dbx-box">
+<h3 class="dbx-handle">Post Date</h3>
+<div class="dbx-content"> <input type="text" name="rant_date" value="<?php echo date('Y-m-d H:i:s'); ?>" /> </div>
+</fieldset>
+
+<fieldset id="statusdiv" class="dbx-box">
+<h3 class="dbx-handle">Published Status</h3>
+<div class="dbx-content">
+	<label><input type="radio" name="rant_status" value="draft" checked="checked"/>Draft</label>
+	<label><input type="radio" name="rant_status" value="published"/>Published</label>
+</div>
+</fieldset>
+
+</div>
+</div>
+
+<fieldset id="titlediv">
+	<legend>Title</legend>
+	<div><input type="text" name="title" size="40" tabindex="1" value="" id="title" /></div>
+</fieldset>
+
+<fieldset id="linkdiv">
+	<legend>Link</legend>
+	<div><input type="text" name="link" size="40" tabindex="2" value="<?php echo htmlentities( $currentuser->default_link ); ?>" id="link" /></div>
+</fieldset>
+
+<fieldset id="postdivrich">
+	<legend>Post</legend>
+	
+	<style type="text/css">
+		#postdivrich table, #postdivrich #quicktags {border-top: none;}
+		#quicktags {border-bottom: none; padding-bottom: 2px; margin-bottom: -1px;}
+		#edButtons {border-bottom: 1px solid #ccc;}
+	</style>
+	<div><textarea class="mceEditor" rows="13" cols="40" name="content" tabindex="3" id="content"></textarea></div>
+
+	
+	<?php
+	/*
+	include("include/fckeditor/fckeditor_php4.php");
+	$oFCKeditor = new FCKeditor('content');
+	$oFCKeditor->BasePath = 'include/fckeditor/';
+	$oFCKeditor->Value = '';
+	$oFCKeditor->Create();
+	*/
+	?>
+	
+	
+	
+</fieldset>
+
+
+
+<p class="submit">
+ <input name="save" type="submit" id="save" tabindex="3" value="Save and Continue Editing" style="font-weight: bold;" />
+ <input name="publish" type="submit" id="publish" tabindex="5" accesskey="p" value="Publish" />
+</p>
+
+
+
+<div class="dbx-b-ox-wrapper">
+
+<fieldset id="rant-image" class="dbx-box">
+	<h3 class="dbx-handle">Image</h3>
+	<div>
+	<table border="0" cellpadding="4">
+	<tr><td valign="top" width="40%">
+	<p><?php
+
+		// no image in place yet
+		$rantimage_filename = SITE_RANT.'/' . $currentuser->default_image;
+		if( file_exists( SITE_PATH_ABS.'/' . $rantimage_filename )) {
+			echo 'Currently using default rant image for this contributor. <a href="user-edit.php?edit='.$currentuser->id.'">Change default</a>.';
+		} else {
+			echo $rantimage_filename;
+			$rantimage_filename = false;
+			echo 'There is currently no image associated with this rant, <br/>and no default rant image associated with this contributor.
+			<br/><a href="user-edit.php?edit=' . $currentuser->id . '">Add a default rant image to your profile.</a>';
+		}
+	?>
+	</p>
+	<p>Upload a rant image:<br/>
+		<input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
+		<input name="ranterImage" type="file"/>
+	</p>
+		
+	</td><td>
+	<?php if ( $rantimage_filename ): ?>
+		<p><img src="<?php echo SITE_HOST . '/' . SITE_PATH . '/' . $rantimage_filename; ?>" width="150" /></p>
+	<?php endif; ?>
+	</td></tr>
+	<tr><td>
+		<p>Rant image alt text:</p>
+		<input type="text" name="rant_imagetext" size="40" tabindex="2" value="" id="rant_imagetext" />
+	</td></tr>
+	<tr id="rant_attachments"><td>
+		<p>Attach files:</p>
+		<ol id="rant_attachment_list">
+		</ol>
+		<script src="include/rants.js" type="text/javascript"></script>
+		<a href="#rant_attachments" onclick="new_rant_attachment()">(add attachment)</a>
+	</td></tr>
+	</table>
+	</div>
+</fieldset>
+
+</div>
+
+
+</div>
+
+</form>
+
+<?php adminfooter() ?>
diff --git a/post-scratchpad.php b/post-scratchpad.php
new file mode 100644
index 0000000..e340b89
--- /dev/null
+++ b/post-scratchpad.php
@@ -0,0 +1,14 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+check_nonce('new-scratchpad');
+
+$mtdb->query( sprintf( 'INSERT INTO scratchpad (contributor, message) VALUES (%d, "%s")', (int)$currentuser->id, mysql_real_escape_string($_REQUEST['message'])) );
+
+adminlog("User posted to scratchpad.", MTS_SCRATCH, MTA_INSERT);
+_redirect( ADMIN_PATH . '/index.php' );
+
+?>
diff --git a/post-twitter.php b/post-twitter.php
new file mode 100644
index 0000000..8fd01fe
--- /dev/null
+++ b/post-twitter.php
@@ -0,0 +1,148 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+
+if('post_twitter' == $_REQUEST['action'])
+{
+	check_nonce('new-twitter');
+	
+	$postmessage = '';
+	if(!empty($_REQUEST['stdmessage']) ) $postmessage = trim($_REQUEST['stdmessage']);
+	if( strlen($_REQUEST['message']) ) $postmessage = trim($_REQUEST['message']);
+
+	#string replacement macros
+	$next_strip_id = $mtdb->getOne( 'SELECT MAX(id) FROM strip' );
+	$next_strip_id += 1;
+	$postmessage = str_replace("#nextcomic", $next_strip_id, $postmessage);
+
+	if('' == $postmessage) _redirect( ADMIN_PATH . '/post-twitter.php?tweet=missing');
+	$username = sanitize_username($_REQUEST['twitter_user']);
+	$postasuser = $mtdb->getOne( sprintf('SELECT username FROM twitter_user WHERE username="%s"', mysql_real_escape_string($username)));
+
+	if( in_array('twitter', $_REQUEST['service']) )
+		$rc = twitterpost( numeric_entities(utfentities($postmessage)), $postasuser );
+	if( in_array('rss', $_REQUEST['service']) )
+		$rc = rsspost( numeric_entities(utfentities($postmessage)), SITE_HOST.SITE_PATH );
+	
+	if($rc) _redirect( ADMIN_PATH . '/post-twitter.php?tweet=success');
+	_redirect( ADMIN_PATH . '/post-twitter.php?tweet=fail');
+
+	// Shall not pass, all routes lead to redirect.
+}
+
+if( isset($_REQUEST['tweet']) && 'success' == $_REQUEST['tweet'] )
+	$info.='Status successfully posted to Twitter.';
+
+if( isset($_REQUEST['tweet']) && 'fail' == $_REQUEST['tweet'] )
+	$info.='Status could not be posted to Twitter. Is it up?';
+
+if( isset($_REQUEST['tweet']) && 'missing' == $_REQUEST['tweet'] )
+	$error.='Oops~  Looks like you forgot to enter a message.';
+	
+
+$statuses = $mtdb->getAll('SELECT id, position, message FROM twitter_status ORDER BY position, id');
+$twitter_users = $mtdb->getAll('SELECT id, username, oauth_token, oauth_token_secret, oauth_access_token FROM twitter_user ORDER BY username');
+
+adminhead('Update Twitter');
+adminmenu();
+
+?>
+
+<h2>Update Twitter</h2>
+<form name="statusform" method="post" action="post-twitter.php">
+<?php nonce_field('new-twitter'); ?>
+<input type="hidden" name="action" value="post_twitter" />
+<script type="text/javascript" src="<?php echo SITE_HOST.SITE_PATH; ?>/resources.js"></script>
+
+</ul>
+
+<p>Post As: <select name="twitter_user">
+	<?php foreach($twitter_users as $k=>$v) {
+		printf( '<option %s value="%s">%s</option>', ($v->username == TWITTER_USER ? 'selected="selected"' : '') , htmlentities($v->username), htmlentities($v->username) );
+	}
+	?>
+	</select>
+	<a href="manage-twitter-users.php">Edit</a>
+</p>
+<p>Message Preset: <select name="stdmessage" onChange="copyPreset()">
+	<option value=""></option>
+	<!-- TODO: Javascript to copy the preset downward, so it can be edited. -->
+	<?php foreach($statuses as $k=>$v) {
+		printf( '<option value="%s">%s</option>', htmlentities($v->message), htmlentities($v->message) );
+	} ?>
+	</select>
+	<a href="manage-twitter-presets.php">Edit</a>
+</p>
+<p><textarea cols="70" rows="2" id="statusmessage" name="message" maxlength="140" size="140" onKeyDown="charCounter();" onKeyUp="charCounter();"></textarea> <input type="submit" value="Send" /></p>
+<p style="padding-bottom:1em;">Characters remaining: <span id="charactersremaining">140</span>
+<p>
+	Post to:
+	<label><input type="checkbox" name="service[]" value="twitter" selected="selected" checked="checked" /> Twitter</label>
+	<label><input type="checkbox" name="service[]" value="rss" /> RSS</label>
+</p>
+</form>
+
+<script type="text/javascript">
+<!--
+	function copyPreset() {
+		var preset = document.statusform.stdmessage;
+		var status = document.statusform.message
+		status.value = preset.options[preset.selectedIndex].value
+		charCounter()
+	}
+	function charCounter() {
+		var status = document.statusform.message
+		var charactersremaining = document.getElementById('charactersremaining');
+		charactersremaining.innerHTML = 140 - status.value.length
+	}
+-->	
+</script>
+
+<?php /*?>
+<script type="text/javascript" src="http://twitter.com/statuses/user_timeline/<?php echo TWITTER_USER; ?>.json?callback=mtCallback&amp;count=3"></script> */ ?>
+
+<hr/>
+<script src="http://widgets.twimg.com/j/2/widget.js"></script>
+<table border="0"><tr>
+<?php foreach($twitter_users as $k=>$v) { ?>
+	<td>
+<script>
+new TWTR.Widget({
+  version: 2,
+  type: 'profile',
+  rpp: 4,
+  interval: 6000,
+  width: 250,
+  height: 300,
+  theme: {
+    shell: {
+      background: '#ffffff',
+      color: '#000000'
+    },
+    tweets: {
+      background: '#f9fcfc',
+      color: '#000000',
+      links: '#0000ff'
+    }
+  },
+  features: {
+    scrollbar: false,
+    loop: false,
+    live: false,
+    hashtags: true,
+    timestamp: true,
+    avatars: false,
+    behavior: 'all'
+  }
+}).render().setUser('<?php echo $v->username; ?>').start();
+</script>
+	</td>
+<?php } ?>
+</tr></table>
+
+<?php
+adminfooter();
+?>
diff --git a/rss-adminlog.php b/rss-adminlog.php
new file mode 100644
index 0000000..6e720e3
--- /dev/null
+++ b/rss-adminlog.php
@@ -0,0 +1,36 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_basic();
+
+$count = isset($_REQUEST['count']) && ctype_digit($_REQUEST['count']) ? $_REQUEST['count'] : 25;
+
+$entries = $mtdb->getAll("SELECT UNIX_TIMESTAMP(l.logdate) AS logdate, c.name AS cname, c.email AS cmail, s.name AS section, action, level, message FROM admin_log l JOIN admin_section s ON l.section = s.id LEFT JOIN contributor c ON l.contributor = c.id ORDER BY l.logdate DESC LIMIT $count");
+
+header("Content-Type: application/rss+xml;charset=utf-8");
+
+echo "<?xml version=\"1.0\" ?>\n";
+?>
+<rss version="2.0">
+	<channel>
+		<title>Megatokyo Admin Log</title>
+		<link>http://www.megatokyo.com/admin</link>
+		<description>Listing of administrative events: errors, warnings, and notifications.</description>
+		<language>en-us</language>
+
+		<?php foreach($entries as $k=>$v) { ?>
+			<item>
+				<title><?php echo htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></title>
+				<author><?php printf('%s (%s)', $v->cmail, $v->cname) ?></author>
+				<pubDate><?php echo date( DATE_RFC822, $v->logdate ) ?></pubDate>
+				<guid><?php printf('%s%s/%s/view-adminlog.php?timestamp=%d', SITE_HOST, SITE_PATH, SITE_ADMIN, $v->logdate) ?></guid>
+
+				<category domain="<?php printf('%s%s/%s/log-levels', SITE_HOST, SITE_PATH, SITE_ADMIN) ?>"><?php echo $v->level ?></category>
+				<category domain="<?php printf('%s%s/%s/log-section', SITE_HOST, STE_PATH, SITE_ADMIN) ?>"><?php echo $v->section ?></category>
+				<category domain="<?php printf('%s%s/%s/log-acion', SITE_HOST, SITE_PATH, SITE_ADMIN) ?>"><?php echo $v->action ?></category>
+				<description><?php echo htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></description>
+			</item>
+		<?php } ?>
+	</channel>
+</rss>
diff --git a/rss-scratchpad.php b/rss-scratchpad.php
new file mode 100644
index 0000000..d932663
--- /dev/null
+++ b/rss-scratchpad.php
@@ -0,0 +1,33 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_basic();
+
+$count = isset($_REQUEST['count']) && ctype_digit($_REQUEST['count']) ? $_REQUEST['count'] : 25;
+
+$entries = $mtdb->getAll("SELECT UNIX_TIMESTAMP(s.published) AS pubdate, c.name AS cname, c.email AS cmail, message FROM scratchpad s JOIN contributor c ON s.contributor = c.id ORDER BY s.published DESC LIMIT $count");
+
+header("Content-Type: application/rss+xml;charset=utf-8");
+
+echo "<?xml version=\"1.0\" ?>\n";
+?>
+<rss version="2.0">
+	<channel>
+		<title>Megatokyo Admin Scratchpad</title>
+		<link>http://www.megatokyo.com/admin</link>
+		<description>Listing of administrative events: errors, warnings, and notifications.</description>
+		<language>en-us</language>
+
+		<?php foreach($entries as $k=>$v) { ?>
+			<item>
+				<title><?php echo $v->cname, ': ', htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></title>
+				<author><?php printf('%s (%s)', $v->cmail, $v->cname) ?></author>
+				<pubDate><?php echo date( DATE_RFC822, $v->pubdate ) ?></pubDate>
+				<guid><?php printf('%s%s/%s/?timestamp=%d', SITE_HOST, SITE_PATH, SITE_ADMIN, $v->pubdate) ?></guid>
+
+				<description><?php echo $v->cname, ': ', htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></description>
+			</item>
+		<?php } ?>
+	</channel>
+</rss>
diff --git a/rss-striplog.php b/rss-striplog.php
new file mode 100644
index 0000000..6d78c2f
--- /dev/null
+++ b/rss-striplog.php
@@ -0,0 +1,31 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+$count = isset($_REQUEST['count']) && ctype_digit($_REQUEST['count']) ? $_REQUEST['count'] : 25;
+
+$entries = $mtdb->getAll("SELECT UNIX_TIMESTAMP(l.logdate) AS logdate, s.name AS section, action, message FROM admin_log l JOIN admin_section s ON l.section = s.id WHERE s.name = 'strip' ORDER BY l.logdate DESC LIMIT $count");
+
+header("Content-Type: application/rss+xml;charset=utf-8");
+
+echo "<?xml version=\"1.0\" ?>\n";
+?>
+<rss version="2.0">
+	<channel>
+		<title>Megatokyo Admin Log</title>
+		<link>http://www.megatokyo.com/admin</link>
+		<description>Listing of administrative events: errors, warnings, and notifications.</description>
+		<language>en-us</language>
+
+		<?php foreach($entries as $k=>$v) { ?>
+			<item>
+				<title><?php echo htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></title>
+				<author><?php printf('%s (%s)', $v->cmail, $v->cname) ?></author>
+				<pubDate><?php echo date( DATE_RFC822, $v->logdate ) ?></pubDate>
+				<guid><?php printf('%s%s/%s/view-adminlog.php?timestamp=%d', SITE_HOST, SITE_PATH, SITE_ADMIN, $v->logdate) ?></guid>
+				<category domain="<?php printf('%s%s/%s/log-acion', SITE_HOST, SITE_PATH, SITE_ADMIN) ?>"><?php echo $v->action ?></category>
+				<description><?php echo htmlentities($v->message, ENT_COMPAT, 'UTF-8') ?></description>
+			</item>
+		<?php } ?>
+	</channel>
+</rss>
diff --git a/swap-comics.php b/swap-comics.php
new file mode 100644
index 0000000..06e0496
--- /dev/null
+++ b/swap-comics.php
@@ -0,0 +1,58 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+if($_POST)
+{
+	check_nonce('swap-strip');
+	
+	if(!is_numeric($_POST['comic_a']) || !is_numeric($_POST['comic_b']))
+		mtdie('This tool only works on numeric strip numbers.');
+
+	$a = (int)$_POST['comic_a'];
+	$b = (int)$_POST['comic_b'];
+
+	$f = fopen(SITE_PATH_ABS.'/'.SITE_STRIP.'/'.SITE_STRIP_LOCK, 'w');
+	flock($f, LOCK_EX);
+	
+	swap_strips( $a, $b );
+	
+	close($f);
+	
+	$info.='<p>Strips $a and $b swapped successfully.</p>';
+	adminlog("Strips $a and $b have been swapped.", MTS_STRIP, MTA_MODIFY);
+}
+
+
+
+adminhead('Swap Comics');
+adminmenu('swap-comics.php');
+
+?>
+
+<h2>Swap Comics</h2>
+
+<form action="swap-comics.php" method="post" name="post" id="post">
+
+<div id="poststuff">
+
+	<table class="editform" width="100%" cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">First Comic</th>
+	<td width="66%"><input name="comic_a" type="text" id="comic_a" value="" /></th>
+	</tr>
+	<tr>
+	<th scope="row" width="33%">Second Comic</th>
+	<td width="66%"><input name="comic_b" type="text" id="comic_b" value="" /></th>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Swap &raquo;" name="submit" /></p>
+
+</div>
+
+</form>
+
+<?php adminfooter() ?>
diff --git a/twitter-scheduled.php b/twitter-scheduled.php
new file mode 100644
index 0000000..5faa8c2
--- /dev/null
+++ b/twitter-scheduled.php
@@ -0,0 +1,43 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+//	First, the quick hack way. May become neccessary to parallelize later.
+
+$tweets = $mtdb->getAll("SELECT username, password, text, status, twitter_post.id AS id
+	FROM twitter_post JOIN twitter_user
+		ON twitter_post.user = twitter_user.id
+	WHERE twitter_post.status = 'scheduled'
+		AND time >= NOW()
+		AND time < TIMESTAMPADD(" . RUN_INTERVAL . ", NOW())
+");
+
+//	Check if we actually have any tweets. If not, bail.
+if(count($tweets) === 0)
+{
+	exit(0);
+}
+
+//	There are tweets to post. Let's get to work.
+
+foreach($tweets as $t)
+{
+	//	Lock the tweet
+	$mtdb->query("UPDATE twitter_post SET status = 'locked' WHERE id = ".(int)$t->id." AND status = 'scheduled'", false);
+
+	if(twitterpost($t->text, $t->username, $t->password))
+	{
+		//	It worked!
+		adminlog("Scheduled tweet posted for user ".$t->username, MTS_TWITTER, MTA_ADD);
+		$t->status = 'success';
+	}
+	else
+	{
+		//	Well, shit. Something went wrong. Log it.
+		adminlog("Error $ret_code posting scheduled tweet ".$t->id . ' with return value ' . $ret, MTS_TWITTER, MTA_ADD);
+		$t->status = 'error';
+	}
+	
+	//	Unlock tweet, update db.
+	$mtdb->query("UPDATE twitter_post SET status = '".mysql_real_escape_string($t->status)."' WHERE status = 'locked' AND id = ".(int)$t->id, false);
+}
diff --git a/user-edit.php b/user-edit.php
new file mode 100644
index 0000000..6f87eb4
--- /dev/null
+++ b/user-edit.php
@@ -0,0 +1,179 @@
+<?php
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+
+
+if( isset($_POST['edit']) ) {
+
+	if( $_POST['edit'] === 'NEW' ) {
+		$username = sanitize_username( $_POST['user_login'] );
+		if( $username != $_POST['user_login'] || strlen($_POST['user_login']) < 1 )
+			mtdie( 'The specified username is not valid. Must be composed of a-z _ - @ .', 'Invalid Username' );
+		
+		copy(RANTIMG.'default', RANTIMG.$username.'.png');
+		
+		$mtdb->query( 'INSERT INTO contributor (name, default_image) VALUES ("' . mysql_real_escape_string($username) . '", "'.$username.'.png")' );
+		$user = get_userdatabylogin( $username );
+		$userid = $user->id;
+		$info.='<p>User Account Created</p>';
+		adminlog("User '".$username."' created.", MTS_USER, MTA_ADD);
+		$user_old = $user;
+	} else {
+		$userid = (int) $_POST['edit'];
+		$user_old = $user = get_userdatabyid( $userid );
+	}
+	
+	$user->nameplate = $_POST['nickname'];
+	$user->default_image = $user_old->default_image;
+	$user->default_link = $_POST['rant-link'];
+	$user->email = $_POST['email'];
+	
+	if( !empty($_POST['password_new1']) && !empty($_POST['password_new2']) ) {
+	
+		if( $_POST['password_new1'] !== $_POST['password_new2'] ) {
+			$error.='<p>New passwords do not match.</p>';
+		} else {
+			/* password change */
+			if( ! $mtdb->getOne( 'SELECT id FROM contributor WHERE id = "' . (int)$user->id . '" AND (password = SHA1("' . mysql_real_escape_string($_POST['password_old']) . '") OR password = "")' )) {
+				$error.='<p>Specified password is incorrect.</p>';
+			} else {
+				/* Password match */
+				$user->password = $_POST['password_new1'];
+				change_password( $user );
+				$info.='<p>Password successfully changed.</p>';
+			}
+		}
+	}
+
+	function handle_upload( &$user ) {
+		global $info,$error;
+		
+		if( !$_FILES['rant_image'] ) return;
+		
+		if( '' == $_FILES['rant_image']['name'] ) return;
+		if( UPLOAD_ERR_NO_FILE == $_FILES['rant_image']['error'] ) return;
+		if( 0 == $_FILES['rant_image']['size'] ) return;
+		
+		$info.='<p>Tried to upload an image.</p>';
+		// Uploading new rant image
+		$imagedata = getimagesize($_FILES['rant_image']['tmp_name']);
+		if( 300 !== $imagedata[0] ) {
+			$error.='<p>Image wrong width: '.$imagedata[0].'</p>';
+			return;
+		}
+		if( 245 !== $imagedata[1]) {
+			$error.='<p>Image wrong height: '.$imagedata[1].'</p>';
+			return;
+		}
+		
+		switch( $_FILES['rant_image']['type'] ) {
+			case 'image/jpeg':
+			case 'image/jpg':	$ext = 'jpg'; break;
+			case 'image/gif':	$ext = 'gif'; break;
+			case 'image/png':	$ext = 'png'; break;
+			case 'image/bmp':	$ext = 'bmp'; break;
+			case 'image/tiff':	$ext = 'tiff'; break;
+			default:
+				$error.='<p>Unknown image extension. Upload refused.</p>';
+				return;
+		}
+		
+		$destination_path = $user->name.'.'.$ext;
+		if( !is_uploaded_file( $_FILES['rant_image']['tmp_name'] )) {
+			$error.='<p>Something went wrong while retrieving the uploaded image.</p>';
+			return;
+		}
+		if( move_uploaded_file($_FILES['rant_image']['tmp_name'], RANTIMG.$destination_path) ) {  // TODO: SITE_PATH_ABS .'/'. SITE_RANT ?
+			// great
+			$user->default_image = $destination_path;
+			$info.='<p>New rant image uploaded.</p>';
+		} else {
+			$error.='<p>Something went wrong while storing the uploaded image.</p>';
+			adminlog("File system error while uploading rant image.", MTS_USER, MTA_MODIFY, E_WARNING);
+		}
+	}
+
+	handle_upload( $user );
+	save_userdata( $user );
+	$info.='<p>Changes to user profile information were saved successfully.</p>';
+	adminlog("Profile updated for user ".$user->name.".", MTS_USER, MTA_UPDATE);
+} else {
+	$userid = (int) $_GET['edit'];
+	$user = get_userdatabyid( $userid );
+}			
+				
+if( !$user ) $error.='<p>The specified user does not exist.</p>';
+
+adminhead('Edit User Profile');
+adminmenu('users.php');
+
+if( $user ) {
+
+?>
+<form enctype="multipart/form-data" name="profile" id="your-profile" action="user-edit.php" method="post">
+<input type="hidden" name="edit" value="<?php echo $userid; ?>" />
+<h2>Editing "<?php echo htmlentities($user->name); ?>"</h2>
+<p>Modify details for this contributer.</p>
+
+<fieldset>
+<legend>Name</legend>
+<p><label>Username:<br />
+<input type="text" name="user_login" value="<?php echo htmlentities($user->name); ?>" disabled="disabled" /></label></p>
+
+<p><label>Nickname:<br />
+<input type="text" name="nickname" value="<?php echo htmlentities($user->nameplate); ?>" /></label></p>
+
+<p><label>Email:<br />
+<input type="text" name="email" value="<?php echo htmlentities($user->email); ?>" /></label></p>
+
+</fieldset>
+
+<fieldset>
+<legend>Rant Defaults</legend>
+<p><label>Link<br />
+<input type="text" name="rant-link" value="<?php echo htmlentities($user->default_link); ?>" /></label></p>
+
+<p><label>Upload New Image<br />
+<input type="hidden" name="MAX_FILE_SIZE" value="10000000" />
+<input name="rant_image" type="file" /></label></p>
+
+<?php
+$rantimage_filename = SITE_RANT.'/' . $user->default_image;
+if( !file_exists( SITE_PATH_ABS.'/' . $rantimage_filename )) {
+	echo '<p>There is currently no default rant image for this contributor.</p>';
+} else {
+	echo '<p><img src="' . SITE_HOST . '/' . SITE_PATH . '/' . $rantimage_filename . '" width="150" /></p>';
+}
+?>
+
+</fieldset>
+
+<fieldset>
+<legend>Change Password</legend>
+<p><label>Old Password</br/>
+<input type="password" name="password_old" value="" /></label></p>
+
+<p><label>New Password</br/>
+<input type="password" name="password_new1" value="" /></label></p>
+
+<p><label>Confirm New Password</br/>
+<input type="password" name="password_new2" value="" /></label></p>
+</fieldset>
+
+
+<br clear="all" />
+
+<p class="submit"><input type="submit" value="Update Profile &raquo;" name="submit" /></p>
+
+</form>
+</div>
+
+<?php
+
+}
+
+adminfooter();
+?>
diff --git a/users.php b/users.php
new file mode 100644
index 0000000..e9f2a32
--- /dev/null
+++ b/users.php
@@ -0,0 +1,70 @@
+<?php
+
+/* This page displays a list of comics, 15 per page. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Users');
+adminmenu();
+?>
+<h2>User Administration</h2>
+<p>Make changes to accounts for contributers to the website.</p>
+
+<?php
+
+$users = $mtdb->getAll("SELECT id,name,email,nameplate FROM contributor");
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">User #</th>
+	<th scope="col">Username</th>
+	<th scope="col">Nickname</th>
+	<th scope="col">Email</th>
+	<th scope="col"></th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $users as $s ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="comic-<?php echo $s->id; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $s->id; ?></th>
+		 <td><?php echo $s->name; ?></td>
+		 <td><?php echo $s->nameplate; ?></td>
+		 <td><?php echo $s->email; ?></td>
+		 <td style="text-align: center;"><a href="user-edit.php?edit=<?php echo $s->id; ?>">Edit</a></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+<form enctype="multipart/form-data" name="create-user" id="create-user" action="user-edit.php" method="post">
+<input type="hidden" name="edit" value="NEW" />
+
+<h2>Create New Contributor</h2>
+<div class="narrow">
+	<table class="editform" width="100% cellspacing="2" cellpadding="5">
+	<tr>
+	<th scope="row" width="33%">Username</th>
+	<td width="66%"><input name="user_login" type="text" id="user_login" value="" /></th>
+	</tr>
+	</table>
+	
+	<p class="submit"><input type="submit" value="Create &raquo;" name="submit" /></p>
+</div>
+</form>
+
+<?php
+adminfooter();
+?>
diff --git a/view-adminlog.php b/view-adminlog.php
new file mode 100644
index 0000000..2edebd7
--- /dev/null
+++ b/view-adminlog.php
@@ -0,0 +1,65 @@
+<?php
+
+/* This page displays a list of comics, 15 per page. */
+
+require_once('include/admin.inc.php');
+
+auth_redirect(); // Require logged in user to access this page.
+
+adminhead('Admin Log');
+adminmenu();
+?>
+<h2>Admin Log</h2>
+
+<?php
+
+$page = 1;
+if( isset($_GET['page'] )) $page = (int) $_GET['page'];
+
+$perpage = 15;
+$start = ($page-1) * $perpage;
+
+$total = ceil( $mtdb->getOne("SELECT COUNT(*) FROM admin_log") / $perpage );
+$entries = $mtdb->getAll("SELECT UNIX_TIMESTAMP(l.logdate) AS logstamp, l.logdate AS logdate, c.name AS cname, c.email AS cmail, s.name AS section, action, level, message FROM admin_log l JOIN admin_section s ON l.section = s.id LEFT JOIN contributor c ON l.contributor = c.id ORDER BY l.logdate DESC LIMIT $start,$perpage");
+
+pagination( $page, $total );
+
+?>
+
+<table class="widefat">
+	<thead>
+	<tr>
+	<th scope="col" style="text-align: center;">Date</th>
+	<th scope="col">Contributor</th>
+	<th scope="col">Section</th>
+	<th scope="col">Action</th>
+	<th scope="col">Level</th>
+	<th scope="col">Message</th>
+	</tr>
+	</thead>
+
+	<tbody id="the-list">
+	<?php
+	$alternate=false;
+	foreach( $entries as $e ) {
+		$alternate=!$alternate;
+		?>
+		<tr id="log-<?php echo $e->logstamp; ?>" <?php if($alternate) echo 'class="alternate"'; ?>>
+		 <th scope="row" style="text-align: center;"><?php echo $e->logdate; ?></th>
+		 <td><?php echo $e->cname;  ?></td>
+		 <td><?php echo $e->section; ?></td>
+		 <td><?php echo $e->action; ?></td>
+		 <td><?php echo $e->level ?></td>
+		 <td><?php echo $e->message; ?></td>
+		</tr>
+		<?php
+	}
+	?>
+	</tbody>
+</table>
+
+
+
+<?php
+adminfooter();
+?>
diff --git a/wp-admin.css b/wp-admin.css
new file mode 100644
index 0000000..2ed65ba
--- /dev/null
+++ b/wp-admin.css
@@ -0,0 +1,1341 @@
+* html #poststuff {
+	height: 100%; /* kill peekaboo bug in IE */
+}
+
+/* This is the Holly Hack \*/
+* html .wrap { height: 1% }
+/* For Win IE's eyes only */
+
+body {
+	border: none;
+}
+a {
+	border-bottom: 1px solid #69c;
+	color: #00019b;
+	text-decoration: none;
+}
+
+a.delete:hover {
+	background: #c00;
+	color: #fff;
+}
+
+#devnews h4 {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 18px;
+	font-weight: normal;
+}
+
+#planetnews ul {
+	list-style: none;
+	margin: 0;
+	padding: 0;
+}
+
+#planetnews li {
+	width: 17%;
+	margin: 1%;
+	float: left;
+}
+
+#planetnews li a {
+	display: block;
+	padding: .5em;
+	background: #ddd;
+	height: 6em;
+	overflow: hidden;
+}
+
+#planetnews cite {
+	font-size: 11px;
+}
+
+#planetnews li .post {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 18px;
+	display: block;
+	height: 60px;
+	overflow: hidden;
+}
+
+#planetnews .hidden {
+	display: none;
+}
+
+.readmore {
+	clear: both;
+	text-align: right;
+	margin-right: 5em;
+}
+
+.widefat {
+	width: 100%;
+}
+
+.widefat td, .widefat th {
+	padding: 5px 6px;
+}
+
+.widefat th {
+	text-align: left;
+}
+
+.plugins p {
+	margin: 4px;
+	padding: 0;
+}
+
+.plugins .name {
+	font-size: 16px;
+}
+
+.import-system {
+	font-size: 16px;
+}
+
+thead, .thead {
+	background: #dfdfdf
+}
+
+#import-upload-form {
+	margin: auto;
+	background: #eee;
+	padding: 1em;
+}
+
+a.edit, a.delete, a.edit:hover, a.delete:hover {
+	border-bottom: none;
+	display: block;
+	padding: 5px 0;
+	text-align: center;
+}
+
+a.edit:hover {
+	background: #ccc;
+	color: #036;
+}
+
+a:visited {
+	color: #006;
+}
+
+a:hover {
+/*	border-bottom: 1px solid #3a75ae;*/
+	color: #069;
+}
+
+body	{
+	background: #f9fcfe;
+	color: #000;
+	margin: 0;
+	padding: 0;
+}
+
+body, td {
+	font: 13px "Lucida Grande", "Lucida Sans Unicode", Tahoma, Verdana;
+}
+
+fieldset {
+	border: none;
+	padding: 3px;
+}
+
+fieldset label.selectit {
+	display: block;
+	font-size: 11px;
+	padding: 0 2px;
+}
+
+fieldset label.selectit:hover {
+	background: #e9e9e9;
+}
+
+fieldset legend {
+	padding: .1em .3em;
+}
+
+fieldset.options {
+	padding: 1em;
+}
+
+fieldset.options legend {
+	font-size: 1.5em;
+	font-weight: bold;
+	font-family: Georgia, "Times New Roman", Times, serif;
+}
+
+form, label input {
+	margin: 0;
+	padding: 0;
+}
+
+h2 {
+	border-bottom: .5em solid #e5f3ff;
+	color: #333;
+	font: normal 32px/5px serif;
+	margin: 5px 10px;
+}
+
+img, #footer a {
+	border: 0;
+}
+
+input:focus, textarea:focus, label:focus {
+	background: #fff;
+	border: 1px solid #686868;
+}
+
+label {
+	cursor: pointer;
+}
+
+li, dd {
+	margin-bottom: 6px;
+}
+
+p, li, dl, dd, dt {
+	line-height: 140%;
+}
+
+textarea, input, select {
+	background: #f4f4f4;
+	border: 1px solid #b2b2b2;
+	color: #000;
+	font:  13px Verdana, Arial, Helvetica, sans-serif;
+	margin: 1px;
+	padding: 3px;
+}
+
+#uploading {
+	border-style: none;
+	padding: 0px;
+	margin-bottom: 16px;
+	height: 18em;
+	width: 100%;
+}
+
+form#upload th {
+	text-align: right;
+}
+
+form#upload #post_content, form#upload #post_title {
+	width: 250px;
+}
+
+form#upload #post_content {
+	height: 50px;
+}
+
+.attpreview {
+	width: 1px; /* hug */
+	text-align: center;
+}
+
+.alignleft {
+	float: left
+}
+
+.alignright {
+	float: right;
+}
+
+.alternate {
+	background: #d1d1d1;
+}
+
+.anchors {
+	margin: 10px 20px 10px 20px;
+}
+
+.available-theme {
+	width: 30%;
+	margin: 0 1em;
+	float: left;
+	text-align: center;
+	height: 28em;
+	overflow: hidden;
+}
+
+.available-theme a.screenshot {
+	width: 250px;
+	height: 200px;
+	display: block;
+	margin: auto;
+	background: #f1f1f1;
+	border: 1px solid #ccc;
+	margin-bottom: 10px;
+	overflow: hidden;
+}
+
+.available-theme a.screenshot:hover {
+/*	border: 1px solid #666;*/
+}
+
+.available-theme img {
+	width: 100%;
+}
+
+.checkbox {
+	background: #fff;
+	border: none;
+	margin: 0;
+	padding: 0;
+}
+
+.code {
+	font-family: "Courier New", Courier, monospace;
+}
+
+.commentlist li {
+	border-bottom: 1px solid #ccc;
+	padding: 1em 1em .2em;
+	margin: 0;
+}
+
+.commentlist p {
+	padding: 0;
+	margin: 0 0 .8em;
+}
+
+.clear {
+	clear: both;
+	height: 2px;
+}
+
+.hidden {
+	display: none;
+}
+
+.navigation {
+	display: block;
+	text-align: center;
+	margin-top: 10px;
+	margin-bottom: 30px;
+}
+
+.post-categories {
+	display: inline;
+	margin: 0;
+	padding: 0;
+}
+
+.post-categories li, #ed_toolbar {
+	display: inline;
+}
+
+.quicktags, .search {
+	background: #ccc;
+	color: #000;
+	font: 12px Georgia, "Times New Roman", Times, serif;
+}
+
+.submit input, .submit input:focus, .button, .button:focus {
+	background: url( images/fade-butt.png );
+	border: 3px double #999;
+	border-left-color: #ccc;
+	border-top-color: #ccc;
+	color: #333;
+	padding: 0.25em;
+}
+
+.submit input:active, .button:active {
+	background: #f4f4f4;
+	border: 3px double #ccc;
+	border-left-color: #999;
+	border-top-color: #999;
+}
+
+.button, .button:focus {
+	padding: 0.15em;
+}
+
+* html .button {
+	padding: 0;
+}
+
+.submit, .editform th, #postcustomsubmit {
+	text-align: right;
+}
+
+.optiontable {
+	width: 100%;
+}
+
+.optiontable td, .optiontable th {
+	padding: .5em;
+}
+
+.optiontable th {
+	width: 33%;
+	text-align: right;
+	font-size: 1.3em;
+	font-weight: normal;
+}
+
+.unapproved {
+	color: #888;
+}
+
+.unapproved a:link {
+	color: #b9bcff;
+}
+
+.unapproved a:visited {
+	color: #696dff;
+}
+
+.unapproved a:hover {
+	color: #009ef0;
+}
+
+.approve {
+	display: none;
+}
+
+.unapproved .approve {
+	display: inline;
+}
+
+.unapproved .unapprove {
+	display: none;
+}
+
+.updated, .confirm {
+	background: #CFEBF7 url(images/notice.gif) no-repeat 1em;
+	border: 1px solid #2580B2;
+	margin: 1em 5% 10px;
+	padding: 0 1em 0 3em;
+}
+
+.error {
+	background: #FFEFF7;
+	border: 1px solid #c69;
+	margin: 1em 5% 10px;
+	padding: 0 1em 0 1em;
+}
+
+.wrap {
+	background: #fff;
+	border: 1px solid #ccc;
+	clear: both;
+	margin: 15px 5%;
+	padding: 1em;
+}
+
+.narrow {
+	width: 450px;
+	margin: auto;
+}
+
+.narrow p {
+	line-height: 150%;
+}
+
+.wrap h2 {
+	margin: .4em 0 .5em;
+	clear: both;
+}
+
+* html .wrap h2 {
+	margin-top: 1em;
+}
+
+table .vers {
+	text-align: center;
+}
+
+textarea.all-options, input.all-options {
+	width: 250px;
+}
+
+input.disabled, textarea.disabled {
+	background: #ccc;
+}
+
+#adminmenu {
+	background: #83B4D8;
+	border-top: 3px solid #448abd;
+	margin: 0;
+	padding: .2em .2em .3em 2em;
+}
+
+
+#adminmenu .current, #submenu .current {
+	font-weight: bold;
+	text-decoration: none;
+}
+
+#adminmenu a {
+	color: #000;
+	font-size: 14px;
+	font-weight: normal;
+	margin: 0;
+	padding: 3px 5px;
+	border-bottom: none;
+}
+
+#adminmenu a:hover, #adminmenu a.current {
+	background: #ddeaf4;
+	color: #333;
+}
+
+#adminmenu li, #submenu li {
+	display: inline;
+	line-height: 200%;
+	list-style: none;
+	text-align: center;
+}
+
+#adminmenu a.current {
+	background: #0d324f;
+	border-right: 2px solid #4f96c8;
+	border-top: 1px solid #96c0de;
+	color: #fff;
+	padding-bottom: 8px;
+}
+
+#submenu, #minisub {
+	background: #0d324f;
+	border-bottom: none;
+	margin: 0;
+	padding: 3px 2em 0 3em;
+}
+
+#minisub {
+	height: 6px;
+}
+
+#submenu .current {
+	background: #f9fcfe;
+	border-top: 1px solid #045290;
+	border-right: 2px solid #045290;
+	color: #000;
+}
+
+#submenu a {
+	border: none;
+	color: #fff;
+	font-size: 12px;
+	padding: .3em .4em .4em;
+}
+
+#submenu a:hover {
+	background: #ddeaf4;
+	color: #393939;
+}
+
+#submenu li {
+	line-height: 180%;
+	height: 25px;
+}
+
+
+#categorydiv input, #poststatusdiv input, #commentstatusdiv input, #pingstatusdiv input {
+	border: none;
+}
+
+#postdiv, #titlediv, #guiddiv, #linkdiv {
+	margin: 0 8px 0 0;
+	padding: 0px;
+}
+
+#postdivrich {
+	margin: 0px;
+	padding: 0px;
+}
+
+#content {
+	margin: 0 0 0 0;
+	width: 95%;
+}
+
+#postdivrich #content {
+	padding: .7em;
+	line-height: 140%;
+}
+
+#titlediv input, #guiddiv input, #linkdiv input {
+	margin: 0px;
+	width: 100%;
+}
+
+#currenttheme img {
+	float: left;
+	border: 1px solid #666;
+	margin-right: 1em;
+	margin-bottom: 1.5em;
+	width: 300px;
+}
+
+input.delete:hover {
+	background: #ce0000;
+	color: #fff;
+}
+
+#deletebookmarks:hover {
+	background: #ce0000;
+	color: #fff;
+}
+
+#postdivrich #quicktags {
+	background: #f0f0ee;
+	padding: 0px;
+	border: 1px solid #ccc;
+	border-bottom: none;
+}
+
+#postdiv #quicktags {
+	padding-right: 6px;
+}
+
+#postdivrich #quicktags {
+	display: none;
+}
+
+#quicktags #ed_toolbar {
+	padding: 0px 2px;
+}
+
+#ed_toolbar input {
+	background: #fff url( images/fade-butt.png ) repeat-x 0px -2px;
+	margin: 3px 2px 2px;
+}
+
+#quicktags #ed_strong {
+	font-weight: bold;
+}
+
+#quicktags #ed_link {
+	color: blue;
+	text-decoration: underline;
+}
+
+#quicktags #ed_del {
+	text-decoration: line-through;
+}
+
+#quicktags #ed_em {
+	font-style: italic;
+}
+
+#quicktags #ed_code {
+	font-family: "Courier New", Courier, mono;
+	margin-bottom: 3px;
+}
+
+#title {
+	font-size: 1.7em;
+	padding: 4px;
+}
+
+#postexcerpt div, #attachmentlinks div {
+	margin-right: 8px;
+}
+
+#attachmentlinks textarea {
+	width: 100%;
+	height: 2.5em;
+	margin-bottom: 6px;
+}
+
+* html #postexcerpt .dbx-toggle-open, * html #postexcerpt .dbx-toggle-open {
+	padding-right: 8px;
+}
+
+#excerpt, .attachmentlinks {
+	margin: 0px;
+	height: 4em;
+	width: 100%;
+}
+
+#footer {
+	clear: both;
+	text-align: center;
+	width: 500px;
+	margin: auto;
+	height: 100px;
+}
+
+#footer .docs {
+	padding-top: 19px;
+	line-height: 160%;
+}
+
+#footer .docs a {
+	text-decoration: underline;
+}
+#footer .logo {
+	float: left;
+	margin: 0;
+	padding: 0;
+	font-size:0.5em;
+}
+
+#login {
+	position: relative;
+	background: url('images/login-bkg-tile.gif') no-repeat top center;
+	color: #fff;
+	margin: 5em auto 1em;
+	padding: 20px 0 0;
+	width: 425px;
+}
+
+#login form {
+	background: url('images/login-bkg-bottom.gif') no-repeat bottom center;
+	padding: 0 50px 25px;
+}
+
+#login #login_error {
+	background: #0e3350;
+	border: 1px solid #2571ab;
+	color: #ebcd4e;
+	font-size: 11px;
+	font-weight: bold;
+	padding: .6em;
+	width: 310px;
+	margin: 0 auto;
+	text-align: center;
+}
+
+#login p { 
+	font-size: 12px;
+}
+
+#login p.message { 
+	width: 310px;
+	margin: 0 auto 1em;
+}
+
+#login #login_error a {
+	color: #ebcd4e;
+	border-color: #ebcd4e;
+}
+
+#login #send {
+	color: #fff;
+	text-align: left;
+	font-weight: normal;
+	font-size: 1.1em;
+	_width: 325px;
+	_margin: 0 auto 15px;
+}
+
+#login h1 a {
+	margin: 0 auto;
+	height: 88px;
+	width: 320px;
+	display: block;
+	border-bottom: none;
+	text-indent: -9999px;
+}
+
+#login .hide {
+	display: none;
+}
+
+#login .message {
+	font-size: 10pt;
+	text-align: center;
+}
+
+#login .register {
+	font-size: 20px;
+}
+
+#login input {
+	padding: 4px;
+}
+
+.login ul, #protected #login .bottom {
+	list-style: none;
+	width: 325px;
+	margin: 0 auto;
+	padding: 0;
+	line-height: 1.2;
+}
+
+.login ul li {
+	font-size: 11px;
+}
+
+.login ul li a {
+	color: #0d324f;
+	border: none;
+}
+
+#login ul li a:hover {
+	color: #fff;
+}
+
+#login .input {
+	font-size: 1.8em;
+	margin-top: 3px;
+	width: 97%;
+}
+
+#login p label { 
+	font-size: 11px;
+}
+
+#login input#rememberme {
+	background-color: 0e3757;
+}
+
+#login #submit {
+	margin: 0;
+	font-size: 15px;
+}
+
+.plugins p {
+}
+
+#login .fullwidth {
+	width: 320px;
+}
+
+#searchform {
+	float: left;
+	margin-right: 1em;
+	width: 18em;
+}
+
+#viewarc {
+	float: left;
+	width: 23em;
+	margin-bottom: 1em;
+}
+
+#viewcat {
+	float: left;
+	width: 30em;
+	margin-bottom: 1em;
+}
+
+#postcustom .updatemeta, #postcustom .deletemeta {
+	margin: auto;
+}
+
+#postcustom table {
+	border: 1px solid #ccc;
+	margin: 0px;
+	width: 100%;
+}
+
+#postcustom table input, #postcustom table textarea {
+	width: 95%;
+}
+
+#poststuff {
+	margin-right: 16em;
+}
+
+#save {
+	width: 15em;
+}
+
+#template div {
+	margin-right: 190px;
+}
+
+* html #template div {
+	margin-right: 0px;
+}
+
+#template, #template div, #editcat, #addcat {
+	zoom: 1;
+}
+
+#template textarea {
+	font: small 'Courier New', Courier, monospace;
+	width: 97%;
+}
+
+#templateside {
+	float: right;
+	width: 170px;
+	overflow: hidden;
+}
+
+#templateside h3, #postcustom p.submit {
+	margin: 0;
+}
+
+#templateside ol, #templateside ul {
+	list-style: none;
+	margin: .5em;
+	padding: 0;
+}
+
+#user_info {
+	position: absolute;
+	right: 1em;
+	top: 0;
+	color: #fff;
+	font-size: .9em;
+}
+
+#user_info a {
+	color: #fff;
+}
+
+#wphead {
+	background: #14568a;
+	padding: .8em 19em .8em 2em;
+	color: #c3def1;
+}
+
+#wphead a {
+	color: #fff;
+}
+
+#wphead h1 {
+	font-size: 2.5em;
+	font-weight: normal;
+	letter-spacing: -.05em;
+	margin: 0;
+	font-family: Georgia, "Times New Roman", Times, serif
+}
+
+#wphead h1 span {
+	font-size: .4em;
+	letter-spacing: 0;
+}
+
+#zeitgeist {
+	background: #eee;
+	border: 1px solid #c5c5c5;
+	float: right;
+	font-size: 90%;
+	margin-bottom: .5em;
+	margin-left: 1em;
+	margin-top: .5em;
+	padding: 1em;
+	width: 40%;
+}
+
+#zeitgeist h2, fieldset legend a {
+	border-bottom: none;
+}
+
+* html #zeitgeist h2 {
+	padding-top: 10px;
+}
+
+#zeitgeist h2 {
+	margin-top: .4em;
+}
+
+#zeitgeist h3 {
+	border-bottom: 1px solid #ccc;
+	font-size: 16px;
+	margin: 1em 0 0;
+}
+
+#zeitgeist h3 cite {
+	font-size: 12px;
+	font-style: normal;
+}
+
+#zeitgeist li, #zeitgeist p {
+	margin: .2em 0;
+}
+
+#zeitgeist ul {
+	margin: 0 0 .3em .6em;
+	padding: 0 0 0 .6em;
+}
+
+.active td {
+	background: #BEB;
+}
+.active .name {
+	background: #9C9;
+}
+.alternate.active td {
+	background: #ADA;
+}
+.alternate.active .name {
+	background: #8B8;
+}
+
+#namediv, #emaildiv, #uridiv {
+	float: left;
+}
+
+#ajax-response {
+	padding: .5em;
+}
+
+/* A handy div class for hiding controls.
+Some browsers will disable them when you
+set display:none; */
+.zerosize {
+	height: 0px;
+	width: 0px;
+	margin: 0px;
+	border: 0px;
+	padding: 0px;
+	overflow: hidden;
+	position: absolute;
+}
+
+/* Box stuff */
+.dbx-clone {
+	position:absolute;
+	visibility:hidden;
+}
+.dbx-clone, .dbx-clone .dbx-handle-cursor {
+	cursor:move !important;
+}
+.dbx-dummy {
+	display:block;
+	width:0;
+	height:0;
+	overflow:hidden;
+}
+.dbx-group, .dbx-box, .dbx-handle {
+	position:relative;
+	display:block;
+}
+
+#grabit {
+	width: 188px;
+}
+
+* html #themeselect {
+	padding: 0px 3px;
+	height: 22px;
+}
+
+/****************************************************************
+avoid padding, margins or borders on dbx-box,
+to reduce visual discrepancies between it and the clone.
+overall, dbx-box is best left as visually unstyled as possible
+*****************************************************************/
+.dbx-box {
+	margin:0;
+	padding:0;
+	border:none;
+}
+
+/* Can change this */
+#moremeta fieldset, #advancedstuff fieldset {
+	margin-bottom: 0.3em;
+}
+#moremeta fieldset div {
+	margin: 2px 0 0 0px;
+	padding: 7px;
+}
+#moremeta {
+	line-height: 100%;
+	margin-right: 15px;
+	position: absolute;
+	right: 5%;
+	width: 14.5em;
+}
+#moremeta select {
+	width: 96%;
+}
+
+#slugdiv input, #passworddiv input, #authordiv select, #thumbdiv input, #parentdiv input {
+	margin-top: .5em;
+	width: 90%;
+}
+
+#moremeta h3, #advancedstuff h3 {
+	padding: 3px;
+	font-weight: normal;
+	font-size: 13px;
+}
+
+#advancedstuff div {
+	margin-top: .5em;
+}
+
+#categorydiv ul {
+	list-style: none;
+	padding: 0;
+	margin-left: 10px;
+}
+
+#categorychecklist {
+	height: 12em;
+	overflow: auto;
+	margin-top: 8px;
+}
+
+#categorychecklist li {
+	margin: 0;
+	padding: 0;
+}
+
+#ajaxcat input {
+	border: 1px solid #ccc;
+}
+
+#your-profile #rich_editing {
+	border: none;
+	background: #fff;
+}
+
+#your-profile fieldset {
+	border: 1px solid #ccc;
+	float: left;
+	width: 40%;
+	padding: .5em 2em 1em;
+	margin: 1em 1em 1em 0;
+}
+
+#your-profile fieldset input  {
+	width: 100%;
+	font-size: 20px;
+	padding: 2px;
+}
+
+#your-profile fieldset textarea {
+	width: 100%;
+	padding: 2px;
+}
+
+#your-profile legend {
+	font-family: Georgia, "Times New Roman", Times, serif;
+	font-size: 22px;
+}
+
+/* default box styles */
+
+/* toggle state of inner content area */
+.dbx-box-open .dbx-content {
+	display: block;
+}
+.dbx-box-closed .dbx-content {
+	display: none;
+}
+
+#moremeta .dbx-content {
+	background: url(images/box-butt.gif) no-repeat bottom right;
+	padding-bottom: 10px;
+	padding-right: 2px;
+}
+
+#moremeta fieldset.dbx-box-closed {
+	background: url(images/box-butt.gif) no-repeat bottom;
+	padding-bottom: 9px;
+}
+
+/* handles */
+
+.dbx-handle  {
+	background: #2685af;
+	padding: 6px 1em 2px;
+	font-size: 12px;
+	margin: 0;
+	color: #E3EFF5;
+}
+
+#moremeta .dbx-handle {
+	padding: 6px 1em 2px;
+	font-size: 12px;
+	background: #2685af url(images/box-head.gif) no-repeat right;
+}
+
+#moremeta .dbx-box {
+	background: url(images/box-bg.gif) repeat-y right;
+}
+
+#advancedstuff h3.dbx-handle {
+	margin-left: 7px;
+	margin-bottom: -7px;
+	padding: 6px 1em 0 3px;
+	height: 19px;
+	font-size: 12px;
+	background: #2685af url(images/box-head-right.gif) no-repeat top right;
+}
+
+#advancedstuff div.dbx-handle-wrapper {
+	margin: 0 0 0 -7px;
+	background: #fff url(images/box-head-left.gif) no-repeat top left;
+}
+
+#advancedstuff div.dbx-content {
+	margin-left: 8px;
+	background: url(images/box-bg-right.gif) repeat-y right;
+	padding: 10px 10px 15px 0px;
+}
+
+#postexcerpt div.dbx-content {
+	margin-right: 0;
+	padding-right: 17px;
+}
+
+#advancedstuff div.dbx-content-wrapper {
+	margin-left: -7px;
+	margin-right: 0;
+	background: url(images/box-bg-left.gif) repeat-y left;
+}
+
+#advancedstuff fieldset.dbx-box {
+	padding-bottom: 9px;
+	margin-left: 6px;
+	background: url(images/box-butt-right.gif) no-repeat bottom right;
+}
+
+#advancedstuff div.dbx-box-wrapper {
+	background: url(images/box-butt-left.gif) no-repeat bottom left;
+}
+
+#advancedstuff .dbx-box-closed div.dbx-content-wrapper {
+	padding-bottom: 2px;
+	background: url(images/box-butt-left.gif) no-repeat bottom left;
+}
+
+#advancedstuff .dbx-box {
+	background: url(images/box-butt-right.gif) no-repeat bottom right;
+}
+
+
+/* handle cursors */
+.dbx-handle-cursor {
+	cursor: move;
+}
+
+/* toggle images */
+a.dbx-toggle, a.dbx-toggle:visited {
+	display:block;
+	overflow: hidden;
+	background-image: url( images/toggle.gif );
+	position: absolute;
+	top: 0px;
+	right: 0px;
+	background-repeat: no-repeat;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+}
+
+#moremeta a.dbx-toggle, #moremeta a.dbx-toggle-open:visited {
+	height: 25px;
+	width: 27px;
+	background-position: 0 0px;
+}
+
+#moremeta a.dbx-toggle-open, #moremeta a.dbx-toggle-open:visited {
+	height: 25px;
+	width: 27px;
+	background-position: 0 -25px;
+}
+
+#advancedstuff a.dbx-toggle, #advancedstuff a.dbx-toggle-open:visited {
+	height: 22px;
+	width: 22px;
+	top: 3px;
+	right: 5px;
+	background-position: 0 -3px;
+}
+
+#advancedstuff a.dbx-toggle-open, #advancedstuff a.dbx-toggle-open:visited {
+	height: 22px;
+	width: 22px;
+	top: 3px;
+	right: 5px;
+	background-position: 0 -28px;
+}
+
+#categorychecklist {
+	margin-right: 6px;
+}
+
+/* additional clone styles */
+.dbx-clone {
+	opacity: 0.8;
+	-moz-opacity: 0.8;
+	-khtml-opacity: 0.8;
+	filter: alpha(opacity=80);
+}
+
+#newcat {
+	width: 120px;
+	margin-right: 5px;
+}
+
+input #catadd {
+	background: #a4a4a4;
+	border-bottom: 1px solid #898989;
+	border-left: 1px solid #bcbcbc;
+	border-right: 1px solid #898989;
+	border-top: 1px solid #bcbcbc;
+	color: #fff;
+	font-size: 10px;
+	padding: 0;
+	margin: 0;
+	font-weight: bold;
+	height: 20px;
+	margin-bottom: 2px;
+	text-align: center;
+	width: 37px;
+}
+
+#howto {
+	font-size: 11px;
+	margin: 0 5px;
+	display: block;
+}
+
+#jaxcat {
+	margin: 0;
+	padding: 0;
+}
+
+#ajax-response.alignleft {
+	margin-left: 2em;
+}
+
+#postdivrich #edButtons {
+	padding-left: 3px;
+}
+
+#postdivrich #content, #postdivrich #content:active {
+	border: 1px solid #ccc;
+}
+
+#edButtons input, #edButtons input:active {
+	margin: 0px 2px -1px;
+}
+
+#edButtons input.edButtonFore, #edButtons input.edButtonFore:active {
+	background: #f0f0ee;
+	border-bottom: 1px solid #f0f0ee;
+}
+
+#edButtons input.edButtonBack, #edButtons input.edButtonBack:active {
+	background: #fff url( images/fade-butt.png ) repeat-x 0px 15px;
+	border-bottom: 1px solid #ccc;
+}
+
+.page-numbers {
+	padding: 4px 7px;
+	border: 1px solid #fff;
+	margin-right: 3px;
+}
+
+a.page-numbers {
+	border: 1px solid #ccc;
+}
+
+a.page-numbers:hover {
+	border: 1px solid #999;
+}
+
+.page-numbers.current {
+	border: 1px solid #999;
+	font-weight: bold;
+}
+
+.pagenav span {
+	font-weight: bold;
+	margin: 0 6px;
+}
+
+ul.historic { 
+	margin-bottom: 1em;
+}
\ No newline at end of file