As previously advertised, delete ports that have

vulnerabilities listed in portaudit, and those
that depend on them - part 1

math/mupad
	Relies on xpm, vulnerable since 2004-09-15
net-p2p/torrentflux
	Vulnerable since 2006-10-07
net/tptest
	Vulnerable since 2009-12-17
security/pgp6
	Vulnerable since 2005-07-31
www/p5-RTx-RightsMatrix
	Only works with www/rt36, which is FORBIDDEN
www/p5-RTx-Shredder
	Only works with www/rt36, which is FORBIDDEN
www/p5-RTx-Statistics
	Only works with www/rt36, which is FORBIDDEN
www/plone
	Vulnerable since 2011-02-10
www/pyblosxom
	Vulnerable since 2009-02-11
www/rt36
	Vulnerable since 2009-12-09
www/zope-archetypes
	Depends on www/plone, which is FORBIDDEN
www/zope-calendaring
	Depends on www/plone, which is FORBIDDEN
www/zope-coreblog2
	Depends on www/plone, which is FORBIDDEN
www/zope-i18nlayer
	Depends on www/plone, which is FORBIDDEN
www/zope-plonelanguagetool
	Depends on www/plone, which is FORBIDDEN
www/zope-simpleblog
	Depends on www/plone, which is FORBIDDEN

23 files changed, 0 insertions, 2765 deletions

diff --git a/net-p2p/Makefile b/net-p2p/Makefile
index c8b8d8bc3f30..d255d95d5950 100644
--- a/net-p2p/Makefile
+++ b/net-p2p/Makefile
@@ -99,7 +99,6 @@
     SUBDIR += sharktorrent
     SUBDIR += squall
     SUBDIR += teknap
-    SUBDIR += torrentflux
     SUBDIR += torrentsniff
     SUBDIR += transmission
     SUBDIR += transmission-cli
diff --git a/net-p2p/torrentflux/Makefile b/net-p2p/torrentflux/Makefile
deleted file mode 100644
index acb5d97a8017..000000000000
--- a/net-p2p/torrentflux/Makefile
+++ /dev/null
@@ -1,115 +0,0 @@
-# New ports collection makefile for:	torrentflux
-# Date created:				27 Sep 2005
-# Whom:					Oliver Eikemeier
-#
-# $FreeBSD$
-#
-
-PORTNAME=		torrentflux
-DISTVERSION=		2.0beta1
-CATEGORIES=		net-p2p www
-MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/TorrentFlux%202.0%20beta1
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=		A PHP based BitTorrent client that runs on a web server
-
-FORBIDDEN=	Vulnerable since 2006-10-07, http://portaudit.freebsd.org/72f21372-55e4-11db-a5ae-00508d6a62df.html
-EXPIRATION_DATE=	2011-09-30
-
-RUN_DEPENDS=		${LOCALBASE}/share/adodb/adodb.inc.php:${PORTSDIR}/databases/adodb \
-			${LOCALBASE}/bin/sqlite:${PORTSDIR}/databases/sqlite2 \
-			${LOCALBASE}/bin/btshowmetainfo.py:${PORTSDIR}/net-p2p/py-bittornado-core
-
-NO_PACKAGE=		dependencies need manual installation, see ${FILESDIR}/install.txt.in
-
-USE_PHP=		pcre session sqlite
-WANT_PHP_WEB=		yes
-DEFAULT_PHP_VER?=	5
-IGNORE_WITH_PHP=	4
-USE_PYTHON_RUN=		yes
-
-EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-*
-
-SUB_FILES=		pkg-install pkg-deinstall pkg-message torrentflux.sh
-SUB_LIST=		DOWNLOADS=${WITH_TF_DATADIR} \
-			DATABASE=${WITH_TF_DBDIR}
-
-.ifndef NOPORTDOCS
-SUB_FILES+=		install.txt
-.endif
-
-WRKSRC=			${WRKDIR}/${PORTNAME}_2.0
-
-WWW_DIR?=		${PREFIX}/www/data
-WITH_TF_HTMLDIR?=	${WWW_DIR}/tf
-WITH_TF_DATADIR?=	${DATADIR}/data
-WITH_TF_DBDIR?=		${WITH_TF_DATADIR}/.database
-
-post-extract:
-	@${CP} -f ${FILESDIR}/overlib.js ${WRKSRC}/html
-	@cd ${WRKSRC} && ${FIND} -E html \
-		-type f -regex '.*\.(php|css|js)' -print0 \
-		| ${XARGS} -0 ${REINPLACE_CMD} -e 's/
$$//'
-
-do-build:
-	@${REINPLACE_CMD} \
-		-e 's;%%PREFIX%%;${PREFIX};g' \
-		-e 's;%%DATADIR%%;${DATADIR};g' \
-		-e 's;%%LOCALBASE%%;${LOCALBASE};g' \
-		-e 's;%%DOWNLOADS%%;${WITH_TF_DATADIR};g' \
-		-e 's;%%DATABASE%%;${WITH_TF_DBDIR};g' \
-		-e 's;%%PORTVERSION%%;${DISTVERSION}-${OPSYS}${OSREL};g' \
-		-e "s;^include_once([\"']config.php['\"]);include_once(\"${PREFIX}/etc/tfconfig.php\");" \
-		${WRKSRC}/html/*.php
-	@${REINPLACE_CMD} -e '1s;/usr/bin/env python;${PYTHON_CMD};' \
-		${WRKSRC}/TF_BitTornado/btphptornado.py
-
-do-install:
-	@cd ${WRKSRC}/html \
-	&& ${INSTALL_DATA} config.php ${PREFIX}/etc/tfconfig.php.default \
-	&& ${FIND} -E . \
-		-path './adodb' -prune  \
-		-o -type d -exec ${MKDIR} ${WITH_TF_HTMLDIR}/{} \; \
-		-o -path './config.php' \
-		-o -regex '.*\.(php|css|js|html|gif|png|ico|htaccess)' \
-			-exec ${INSTALL_DATA} {} ${WITH_TF_HTMLDIR}/{} \;
-	@${INSTALL_SCRIPT} ${WRKSRC}/TF_BitTornado/btphptornado.py ${PREFIX}/libexec/
-	@${INSTALL_SCRIPT} ${WRKDIR}/torrentflux.sh ${PREFIX}/etc/rc.d/
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${FILESDIR}/torrentflux.sqlite ${DATADIR}/
-	@[ -f ${PREFIX}/etc/tfconfig.php ] \
-		|| ${CP} ${PREFIX}/etc/tfconfig.php.default ${PREFIX}/etc/tfconfig.php
-.ifndef NOPORTDOCS
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKDIR}/install.txt ${DOCSDIR}/
-.endif
-
-post-install:
-	@cd ${PREFIX} && ${FIND} -d ${WITH_TF_HTMLDIR:S;^${PREFIX}/;;} \
-		-type f -print -o -type d -exec echo "@dirrm {}" \; \
-		>>${TMPPLIST}
-	@if [ -f "${PKGINSTALL}" ]; then \
-		${SETENV} PKG_PREFIX="${PREFIX}" \
-			${SH} "${PKGINSTALL}" ${PKGNAME} POST-INSTALL; \
-	fi
-	@if [ -f "${PKGMESSAGE}" ]; then \
-		${CAT} "${PKGMESSAGE}"; \
-	fi
-
-.include <bsd.port.mk>
-
-# This is evil! If you happen to hate this hack, just delete these lines.
-# OTOH, DATADIR is defined in bsd.port.post.mk, so it won't work earlier
-# (we do not benefit from delayed evaluation in ".if"-lines).
-.if ${WITH_TF_DATADIR:S"^${DATADIR}/""} == data
-pre-everything::
-	@${ECHO} "==============================================="
-	@${ECHO}
-	@${ECHO} "You might want to customize WITH_TF_DATADIR,"
-	@${ECHO} "it should reside on a partition with enough"
-	@${ECHO} "free space for all files you plan to download."
-	@${ECHO}
-	@${ECHO} "NOTE: Do not place it under your webroot."
-	@${ECHO}
-	@${ECHO} "==============================================="
-.endif
diff --git a/net-p2p/torrentflux/distinfo b/net-p2p/torrentflux/distinfo
deleted file mode 100644
index a3a2a65f4a0c..000000000000
--- a/net-p2p/torrentflux/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (torrentflux-2.0beta1.tar.gz) = ea949e860c240a3b869297a882958017f7b66b93dd52f8cccdd5bea350b1eed9
-SIZE (torrentflux-2.0beta1.tar.gz) = 954541
diff --git a/net-p2p/torrentflux/files/extra-patch-multiup.php b/net-p2p/torrentflux/files/extra-patch-multiup.php
deleted file mode 100644
index 08ce48d2d787..000000000000
--- a/net-p2p/torrentflux/files/extra-patch-multiup.php
+++ /dev/null
@@ -1,149 +0,0 @@
---- html/index.php.orig	Mon Oct 10 00:08:03 2005
-+++ html/index.php	Mon Oct 10 00:08:54 2005
-@@ -365,6 +381,7 @@
- 		<?php echo _SELECTFILE ?>:<br>
- 		<input type="File" name="upload_file" size="40">
- 		<input type="Submit" value="<?php echo _UPLOAD ?>">	
-+		<a href="multiup.php">Upload More?</a>
- 		</td>
- 		</form>
- 	</tr>
---- html/multiup.php.orig	Thu Sep 29 09:57:15 2005
-+++ html/multiup.php	Thu Sep 29 10:49:42 2005
-@@ -0,0 +1,136 @@
-+<?php
-+
-+/*************************************************************
-+*  TorrentFlux - PHP Torrent Manager
-+*  www.torrentflux.com
-+**************************************************************/
-+/*
-+  This file is part of TorrentFlux.
-+
-+  TorrentFlux is free software; you can redistribute it and/or modify
-+  it under the terms of the GNU General Public License as published by
-+  the Free Software Foundation; either version 2 of the License, or
-+  (at your option) any later version.
-+
-+  TorrentFlux is distributed in the hope that it will be useful,
-+  but WITHOUT ANY WARRANTY; without even the implied warranty of
-+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+  GNU General Public License for more details.
-+
-+  You should have received a copy of the GNU General Public License
-+  along with TorrentFlux; if not, write to the Free Software
-+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-+*/
-+
-+
-+include_once("config.php");
-+include_once("functions.php");
-+
-+if (!empty($_FILES['upload_files'])) {
-+    //echo '<pre>'; var_dump($_FILES); echo '</pre>';
-+    foreach($_FILES['upload_files']['size'] as $id => $size) {
-+        if ($size == 0)
-+        {
-+            //no or empty file, skip it
-+            continue;
-+        }
-+        $file_name = stripslashes($_FILES['upload_files']['name'][$id]);
-+        $file_name = str_replace(array("'",","), "", $file_name);
-+        $file_name = cleanFileName($file_name);
-+        $ext_msg = "";
-+
-+        if($_FILES['upload_files']['size'][$id] <= $cfg["max_upload"] &&
-+           $_FILES['upload_files']['size'][$id] > $cfg["min_upload"])
-+        {
-+            if (ereg(getFileFilter($cfg["file_types_array"]), $file_name))
-+            {
-+                //FILE IS BEING UPLOADED
-+                if (is_file($cfg["torrent_file_path"].$file_name))
-+                {
-+                    // Error
-+                    $messages .= "<b>Error</b> with (<b>".$file_name."</b>), the file already exists on the server.<br><center><a href=\"".$_SERVER['PHP_SELF']."\">[Refresh]</a></center>";
-+                    $ext_msg = "DUPLICATE :: ";
-+                }
-+                else
-+                {
-+                    if(move_uploaded_file($_FILES['upload_files']['tmp_name'][$id], $cfg["torrent_file_path"].$file_name))
-+                    {
-+                        chmod($cfg["torrent_file_path"].$file_name, 0644);
-+                        AuditAction($cfg["constants"]["file_upload"], $file_name);
-+                    }
-+                    else
-+                    {
-+                        $messages .= "<font color=\"#ff0000\" size=3>ERROR: File not uploaded, file could not be found or could not be moved:<br>".$cfg["torrent_file_path"] . $file_name."</font><br>";
-+                    }
-+                }
-+            }
-+            else
-+            {
-+                $messages .= "<font color=\"#ff0000\" size=3>ERROR: The type of file you are uploading is not allowed.</font><br>";
-+            }
-+        }
-+        else
-+        {
-+            $messages .= "<font color=\"#ff0000\" size=3>ERROR: File not uploaded, check file size limit.</font><br>";
-+        }
-+
-+        if($messages != "")
-+        {
-+            // there was an error
-+            AuditAction($cfg["constants"]["error"], $cfg["constants"]["file_upload"]." :: ".$ext_msg.$file_name);
-+        }
-+        else
-+        {
-+            header("location: index.php");
-+        }
-+    }  // End File Upload
-+}
-+    
-+displayHead("Upload Multiple Torrents");
-+?>
-+
-+<?php
-+if ($messages != "")
-+{
-+?>
-+<table border="1" cellpadding="10" bgcolor="#ff9b9b">
-+    <tr>
-+    <td><div align="center"><?php echo $messages ?></div></td>
-+    </tr>
-+</table><br><br>
-+<?php
-+}
-+?>
-+
-+<table border="0" cellpadding="0" cellspacing="0" width="760">
-+  <tr>
-+    <td>
-+      <table border="1" bordercolor="<?php echo $cfg["table_border_dk"] ?>" cellpadding="4" cellspacing="0" width="100%">
-+        <tr>
-+          <td bgcolor="<?php echo $cfg["table_header_bg"] ?>">
-+            <table width="100%" cellpadding="3" cellspacing="0" border="0">
-+              <form name="form_file" action="multiup.php" method="post" enctype="multipart/form-data">
-+              <?php for($j = 0; $j < 5; ++$j) { ?>
-+              <tr>
-+                <?php for($i = 0; $i < 2; ++$i) { ?>
-+                <td>
-+                  <?php echo _SELECTFILE ?>:<br>
-+                  <input type="File" name="upload_files[]" size="40">
-+                </td>
-+                <?php } ?>
-+              </tr>
-+              <?php } ?>
-+              <tr>
-+                <td>
-+                  <input type="Submit" value="<?php echo _UPLOAD ?>" method="post">
-+                </td>
-+              </tr>
-+              </form>
-+            </table>
-+          </td>
-+        </tr>
-+      </table>
-+    </td>
-+  </tr>
-+</table>
-+<?php DisplayFoot(); ?>
diff --git a/net-p2p/torrentflux/files/install.txt.in b/net-p2p/torrentflux/files/install.txt.in
deleted file mode 100644
index 9d23cd120d7c..000000000000
--- a/net-p2p/torrentflux/files/install.txt.in
+++ /dev/null
@@ -1,57 +0,0 @@
-FreeBSD TorrentFlux installation
-
-  $FreeBSD$
-
-These are the steps to install TorrentFlux with LightTPD, SQLite and eAccelerator.
-Some manual configuration is necessary, but it should be fairly easy to get the
-port up and running.
-
-1. install port www/php5-cgi
-   - Check "Enable fastcgi support"
-
-2. copy %%LOCALBASE%%/etc/php.ini-recommended to %%LOCALBASE%%/etc/php.ini
-   - Comment the line
-         error_reporting  =  E_ALL
-     and uncomment
-         error_reporting  =  E_ALL & ~E_NOTICE
-
-3. (optional) install databases/sqlite2 with NOPORTDOCS=yes
-   - this port is pulled in either ways, but you may want to avoid installing
-     TCL as a build dependency
-
-4. install port net-p2p/torrentflux with WITH_TF_DATADIR=/your/download/directory
-   - The directory must be writable by the 'www' user and reside on a
-     partition with enough free space to accommodate all files you plan
-     to download. It will be created if it doesn't exist.
-
-     (hint) you can put it on an encrypted partition:
-       http://www.freebsd.org/doc/en_US.ISO8859-1/books/handbook/disks-encrypting.html
-
-   - (optional) edit %%PREFIX%%/etc/tfconfig.php:
-     depredating on your network configuration, you might want to change
-     "minport", "maxport" and "cmd_options"
-
-     (note) when you want to utilize port net/trickle to throttle the total bandwidth,
-     do something like
-       $cfg["btphpbin"] = "%%LOCALBASE%%/bin/trickle -parameters %%PREFIX%%/libexec/btphptornado.py";
-
-5. install port www/lighttpd
-   - copy %%LOCALBASE%%/etc/lighttpd.conf.sample to %%LOCALBASE%%/etc/lighttpd.conf
-   - edit %%LOCALBASE%%/etc/lighttpd.conf:
-     enable "mod_fastcgi"
-     uncomment the "fastcgi.server" section
-   - add lighttpd_enable="YES" to /etc/rc.conf
-
-7. install port www/eaccelerator
-   - add the line
-       extension=eaccelerator.so
-     to %%LOCALBASE%%/etc/php/extensions.ini
-
-8. create an administrator account:
-   - run lighttpd:
-       %%LOCALBASE%%/etc/rc.d/lighttpd.sh start
-   - Open http://127.0.0.1/tf/login.php in a browser
-     The first user to log in is automatically declared administrator
-
-To Do:
-  - add instructions how to run the port with mod_php5 and apache
diff --git a/net-p2p/torrentflux/files/overlib.js b/net-p2p/torrentflux/files/overlib.js
deleted file mode 100644
index b0ca8ac04ca9..000000000000
--- a/net-p2p/torrentflux/files/overlib.js
+++ /dev/null
@@ -1,1491 +0,0 @@
-//\/////
-//\  overLIB 4.21 - You may not remove or change this notice.
-//\  Copyright Erik Bosrup 1998-2004. All rights reserved.
-//\
-//\  Contributors are listed on the homepage.
-//\  This file might be old, always check for the latest version at:
-//\  http://www.bosrup.com/web/overlib/
-//\
-//\  Please read the license agreement (available through the link above)
-//\  before using overLIB. Direct any licensing questions to erik@bosrup.com.
-//\
-//\  Do not sell this as your own work or remove this copyright notice. 
-//\  For full details on copying or changing this script please read the
-//\  license agreement at the link above. Please give credit on sites that
-//\  use overLIB and submit changes of the script so other people can use
-//\  them as well.
-//   $Revision: 1.119 $                $Date: 2005/07/02 23:41:44 $
-//\/////
-//\mini
-
-////////
-// PRE-INIT
-// Ignore these lines, configuration is below.
-////////
-var olLoaded = 0;var pmStart = 10000000; var pmUpper = 10001000; var pmCount = pmStart+1; var pmt=''; var pms = new Array(); var olInfo = new Info('4.21', 1);
-var FREPLACE = 0; var FBEFORE = 1; var FAFTER = 2; var FALTERNATE = 3; var FCHAIN=4;
-var olHideForm=0;  // parameter for hiding SELECT and ActiveX elements in IE5.5+ 
-var olHautoFlag = 0;  // flags for over-riding VAUTO and HAUTO if corresponding
-var olVautoFlag = 0;  // positioning commands are used on the command line
-var hookPts = new Array(), postParse = new Array(), cmdLine = new Array(), runTime = new Array();
-// for plugins
-registerCommands('donothing,inarray,caparray,sticky,background,noclose,caption,left,right,center,offsetx,offsety,fgcolor,bgcolor,textcolor,capcolor,closecolor,width,border,cellpad,status,autostatus,autostatuscap,height,closetext,snapx,snapy,fixx,fixy,relx,rely,fgbackground,bgbackground,padx,pady,fullhtml,above,below,capicon,textfont,captionfont,closefont,textsize,captionsize,closesize,timeout,function,delay,hauto,vauto,closeclick,wrap,followmouse,mouseoff,closetitle,cssoff,compatmode,cssclass,fgclass,bgclass,textfontclass,captionfontclass,closefontclass');
-
-////////
-// DEFAULT CONFIGURATION
-// Settings you want everywhere are set here. All of this can also be
-// changed on your html page or through an overLIB call.
-////////
-if (typeof ol_fgcolor=='undefined') var ol_fgcolor="#CCCCFF";
-if (typeof ol_bgcolor=='undefined') var ol_bgcolor="#333399";
-if (typeof ol_textcolor=='undefined') var ol_textcolor="#000000";
-if (typeof ol_capcolor=='undefined') var ol_capcolor="#FFFFFF";
-if (typeof ol_closecolor=='undefined') var ol_closecolor="#9999FF";
-if (typeof ol_textfont=='undefined') var ol_textfont="Verdana,Arial,Helvetica";
-if (typeof ol_captionfont=='undefined') var ol_captionfont="Verdana,Arial,Helvetica";
-if (typeof ol_closefont=='undefined') var ol_closefont="Verdana,Arial,Helvetica";
-if (typeof ol_textsize=='undefined') var ol_textsize="1";
-if (typeof ol_captionsize=='undefined') var ol_captionsize="1";
-if (typeof ol_closesize=='undefined') var ol_closesize="1";
-if (typeof ol_width=='undefined') var ol_width="200";
-if (typeof ol_border=='undefined') var ol_border="1";
-if (typeof ol_cellpad=='undefined') var ol_cellpad=2;
-if (typeof ol_offsetx=='undefined') var ol_offsetx=10;
-if (typeof ol_offsety=='undefined') var ol_offsety=10;
-if (typeof ol_text=='undefined') var ol_text="Default Text";
-if (typeof ol_cap=='undefined') var ol_cap="";
-if (typeof ol_sticky=='undefined') var ol_sticky=0;
-if (typeof ol_background=='undefined') var ol_background="";
-if (typeof ol_close=='undefined') var ol_close="Close";
-if (typeof ol_hpos=='undefined') var ol_hpos=RIGHT;
-if (typeof ol_status=='undefined') var ol_status="";
-if (typeof ol_autostatus=='undefined') var ol_autostatus=0;
-if (typeof ol_height=='undefined') var ol_height=-1;
-if (typeof ol_snapx=='undefined') var ol_snapx=0;
-if (typeof ol_snapy=='undefined') var ol_snapy=0;
-if (typeof ol_fixx=='undefined') var ol_fixx=-1;
-if (typeof ol_fixy=='undefined') var ol_fixy=-1;
-if (typeof ol_relx=='undefined') var ol_relx=null;
-if (typeof ol_rely=='undefined') var ol_rely=null;
-if (typeof ol_fgbackground=='undefined') var ol_fgbackground="";
-if (typeof ol_bgbackground=='undefined') var ol_bgbackground="";
-if (typeof ol_padxl=='undefined') var ol_padxl=1;
-if (typeof ol_padxr=='undefined') var ol_padxr=1;
-if (typeof ol_padyt=='undefined') var ol_padyt=1;
-if (typeof ol_padyb=='undefined') var ol_padyb=1;
-if (typeof ol_fullhtml=='undefined') var ol_fullhtml=0;
-if (typeof ol_vpos=='undefined') var ol_vpos=BELOW;
-if (typeof ol_aboveheight=='undefined') var ol_aboveheight=0;
-if (typeof ol_capicon=='undefined') var ol_capicon="";
-if (typeof ol_frame=='undefined') var ol_frame=self;
-if (typeof ol_timeout=='undefined') var ol_timeout=0;
-if (typeof ol_function=='undefined') var ol_function=null;
-if (typeof ol_delay=='undefined') var ol_delay=0;
-if (typeof ol_hauto=='undefined') var ol_hauto=0;
-if (typeof ol_vauto=='undefined') var ol_vauto=0;
-if (typeof ol_closeclick=='undefined') var ol_closeclick=0;
-if (typeof ol_wrap=='undefined') var ol_wrap=0;
-if (typeof ol_followmouse=='undefined') var ol_followmouse=1;
-if (typeof ol_mouseoff=='undefined') var ol_mouseoff=0;
-if (typeof ol_closetitle=='undefined') var ol_closetitle='Close';
-if (typeof ol_compatmode=='undefined') var ol_compatmode=0;
-if (typeof ol_css=='undefined') var ol_css=CSSOFF;
-if (typeof ol_fgclass=='undefined') var ol_fgclass="";
-if (typeof ol_bgclass=='undefined') var ol_bgclass="";
-if (typeof ol_textfontclass=='undefined') var ol_textfontclass="";
-if (typeof ol_captionfontclass=='undefined') var ol_captionfontclass="";
-if (typeof ol_closefontclass=='undefined') var ol_closefontclass="";
-
-////////
-// ARRAY CONFIGURATION
-////////
-
-// You can use these arrays to store popup text here instead of in the html.
-if (typeof ol_texts=='undefined') var ol_texts = new Array("Text 0", "Text 1");
-if (typeof ol_caps=='undefined') var ol_caps = new Array("Caption 0", "Caption 1");
-
-////////
-// END OF CONFIGURATION
-// Don't change anything below this line, all configuration is above.
-////////
-
-
-
-
-
-////////
-// INIT
-////////
-// Runtime variables init. Don't change for config!
-var o3_text="";
-var o3_cap="";
-var o3_sticky=0;
-var o3_background="";
-var o3_close="Close";
-var o3_hpos=RIGHT;
-var o3_offsetx=2;
-var o3_offsety=2;
-var o3_fgcolor="";
-var o3_bgcolor="";
-var o3_textcolor="";
-var o3_capcolor="";
-var o3_closecolor="";
-var o3_width=100;
-var o3_border=1;
-var o3_cellpad=2;
-var o3_status="";
-var o3_autostatus=0;
-var o3_height=-1;
-var o3_snapx=0;
-var o3_snapy=0;
-var o3_fixx=-1;
-var o3_fixy=-1;
-var o3_relx=null;
-var o3_rely=null;
-var o3_fgbackground="";
-var o3_bgbackground="";
-var o3_padxl=0;
-var o3_padxr=0;
-var o3_padyt=0;
-var o3_padyb=0;
-var o3_fullhtml=0;
-var o3_vpos=BELOW;
-var o3_aboveheight=0;
-var o3_capicon="";
-var o3_textfont="Verdana,Arial,Helvetica";
-var o3_captionfont="Verdana,Arial,Helvetica";
-var o3_closefont="Verdana,Arial,Helvetica";
-var o3_textsize="1";
-var o3_captionsize="1";
-var o3_closesize="1";
-var o3_frame=self;
-var o3_timeout=0;
-var o3_timerid=0;
-var o3_allowmove=0;
-var o3_function=null; 
-var o3_delay=0;
-var o3_delayid=0;
-var o3_hauto=0;
-var o3_vauto=0;
-var o3_closeclick=0;
-var o3_wrap=0;
-var o3_followmouse=1;
-var o3_mouseoff=0;
-var o3_closetitle='';
-var o3_compatmode=0;
-var o3_css=CSSOFF;
-var o3_fgclass="";
-var o3_bgclass="";
-var o3_textfontclass="";
-var o3_captionfontclass="";
-var o3_closefontclass="";
-
-// Display state variables
-var o3_x = 0;
-var o3_y = 0;
-var o3_showingsticky = 0;
-var o3_removecounter = 0;
-
-// Our layer
-var over = null;
-var fnRef, hoveringSwitch = false;
-var olHideDelay;
-
-// Decide browser version
-var isMac = (navigator.userAgent.indexOf("Mac") != -1);
-var olOp = (navigator.userAgent.toLowerCase().indexOf('opera') > -1 && document.createTextNode);  // Opera 7
-var olNs4 = (navigator.appName=='Netscape' && parseInt(navigator.appVersion) == 4);
-var olNs6 = (document.getElementById) ? true : false;
-var olKq = (olNs6 && /konqueror/i.test(navigator.userAgent));
-var olIe4 = (document.all) ? true : false;
-var olIe5 = false; 
-var olIe55 = false; // Added additional variable to identify IE5.5+
-var docRoot = 'document.body';
-
-// Resize fix for NS4.x to keep track of layer
-if (olNs4) {
-	var oW = window.innerWidth;
-	var oH = window.innerHeight;
-	window.onresize = function() { if (oW != window.innerWidth || oH != window.innerHeight) location.reload(); }
-}
-
-// Microsoft Stupidity Check(tm).
-if (olIe4) {
-	var agent = navigator.userAgent;
-	if (/MSIE/.test(agent)) {
-		var versNum = parseFloat(agent.match(/MSIE[ ](\d\.\d+)\.*/i)[1]);
-		if (versNum >= 5){
-			olIe5=true;
-			olIe55=(versNum>=5.5&&!olOp) ? true : false;
-			if (olNs6) olNs6=false;
-		}
-	}
-	if (olNs6) olIe4 = false;
-}
-
-// Check for compatability mode.
-if (document.compatMode && document.compatMode == 'CSS1Compat') {
-	docRoot= ((olIe4 && !olOp) ? 'document.documentElement' : docRoot);
-}
-
-// Add window onload handlers to indicate when all modules have been loaded
-// For Netscape 6+ and Mozilla, uses addEventListener method on the window object
-// For IE it uses the attachEvent method of the window object and for Netscape 4.x
-// it sets the window.onload handler to the OLonload_handler function for Bubbling
-if(window.addEventListener) window.addEventListener("load",OLonLoad_handler,false);
-else if (window.attachEvent) window.attachEvent("onload",OLonLoad_handler);
-
-var capExtent;
-
-////////
-// PUBLIC FUNCTIONS
-////////
-
-// overlib(arg0,...,argN)
-// Loads parameters into global runtime variables.
-function overlib() {
-	if (!olLoaded || isExclusive(overlib.arguments)) return true;
-	if (olCheckMouseCapture) olMouseCapture();
-	if (over) {
-		over = (typeof over.id != 'string') ? o3_frame.document.all['overDiv'] : over;
-		cClick();
-	}
-
-	// Load defaults to runtime.
-  olHideDelay=0;
-	o3_text=ol_text;
-	o3_cap=ol_cap;
-	o3_sticky=ol_sticky;
-	o3_background=ol_background;
-	o3_close=ol_close;
-	o3_hpos=ol_hpos;
-	o3_offsetx=ol_offsetx;
-	o3_offsety=ol_offsety;
-	o3_fgcolor=ol_fgcolor;
-	o3_bgcolor=ol_bgcolor;
-	o3_textcolor=ol_textcolor;
-	o3_capcolor=ol_capcolor;
-	o3_closecolor=ol_closecolor;
-	o3_width=ol_width;
-	o3_border=ol_border;
-	o3_cellpad=ol_cellpad;
-	o3_status=ol_status;
-	o3_autostatus=ol_autostatus;
-	o3_height=ol_height;
-	o3_snapx=ol_snapx;
-	o3_snapy=ol_snapy;
-	o3_fixx=ol_fixx;
-	o3_fixy=ol_fixy;
-	o3_relx=ol_relx;
-	o3_rely=ol_rely;
-	o3_fgbackground=ol_fgbackground;
-	o3_bgbackground=ol_bgbackground;
-	o3_padxl=ol_padxl;
-	o3_padxr=ol_padxr;
-	o3_padyt=ol_padyt;
-	o3_padyb=ol_padyb;
-	o3_fullhtml=ol_fullhtml;
-	o3_vpos=ol_vpos;
-	o3_aboveheight=ol_aboveheight;
-	o3_capicon=ol_capicon;
-	o3_textfont=ol_textfont;
-	o3_captionfont=ol_captionfont;
-	o3_closefont=ol_closefont;
-	o3_textsize=ol_textsize;
-	o3_captionsize=ol_captionsize;
-	o3_closesize=ol_closesize;
-	o3_timeout=ol_timeout;
-	o3_function=ol_function;
-	o3_delay=ol_delay;
-	o3_hauto=ol_hauto;
-	o3_vauto=ol_vauto;
-	o3_closeclick=ol_closeclick;
-	o3_wrap=ol_wrap;	
-	o3_followmouse=ol_followmouse;
-	o3_mouseoff=ol_mouseoff;
-	o3_closetitle=ol_closetitle;
-	o3_css=ol_css;
-	o3_compatmode=ol_compatmode;
-	o3_fgclass=ol_fgclass;
-	o3_bgclass=ol_bgclass;
-	o3_textfontclass=ol_textfontclass;
-	o3_captionfontclass=ol_captionfontclass;
-	o3_closefontclass=ol_closefontclass;
-	
-	setRunTimeVariables();
-	
-	fnRef = '';
-	
-	// Special for frame support, over must be reset...
-	o3_frame = ol_frame;
-	
-	if(!(over=createDivContainer())) return false;
-
-	parseTokens('o3_', overlib.arguments);
-	if (!postParseChecks()) return false;
-
-	if (o3_delay == 0) {
-		return runHook("olMain", FREPLACE);
- 	} else {
-		o3_delayid = setTimeout("runHook('olMain', FREPLACE)", o3_delay);
-		return false;
-	}
-}
-
-// Clears popups if appropriate
-function nd(time) {
-	if (olLoaded && !isExclusive()) {
-		hideDelay(time);  // delay popup close if time specified
-
-		if (o3_removecounter >= 1) { o3_showingsticky = 0 };
-		
-		if (o3_showingsticky == 0) {
-			o3_allowmove = 0;
-			if (over != null && o3_timerid == 0) runHook("hideObject", FREPLACE, over);
-		} else {
-			o3_removecounter++;
-		}
-	}
-	
-	return true;
-}
-
-// The Close onMouseOver function for stickies
-function cClick() {
-	if (olLoaded) {
-		runHook("hideObject", FREPLACE, over);
-		o3_showingsticky = 0;	
-	}	
-	return false;
-}
-
-// Method for setting page specific defaults.
-function overlib_pagedefaults() {
-	parseTokens('ol_', overlib_pagedefaults.arguments);
-}
-
-
-////////
-// OVERLIB MAIN FUNCTION
-////////
-
-// This function decides what it is we want to display and how we want it done.
-function olMain() {
-	var layerhtml, styleType;
- 	runHook("olMain", FBEFORE);
- 	
-	if (o3_background!="" || o3_fullhtml) {
-		// Use background instead of box.
-		layerhtml = runHook('ol_content_background', FALTERNATE, o3_css, o3_text, o3_background, o3_fullhtml);
-	} else {
-		// They want a popup box.
-		styleType = (pms[o3_css-1-pmStart] == "cssoff" || pms[o3_css-1-pmStart] == "cssclass");
-
-		// Prepare popup background
-		if (o3_fgbackground != "") o3_fgbackground = "background=\""+o3_fgbackground+"\"";
-		if (o3_bgbackground != "") o3_bgbackground = (styleType ? "background=\""+o3_bgbackground+"\"" : o3_bgbackground);
-
-		// Prepare popup colors
-		if (o3_fgcolor != "") o3_fgcolor = (styleType ? "bgcolor=\""+o3_fgcolor+"\"" : o3_fgcolor);
-		if (o3_bgcolor != "") o3_bgcolor = (styleType ? "bgcolor=\""+o3_bgcolor+"\"" : o3_bgcolor);
-
-		// Prepare popup height
-		if (o3_height > 0) o3_height = (styleType ? "height=\""+o3_height+"\"" : o3_height);
-		else o3_height = "";
-
-		// Decide which kinda box.
-		if (o3_cap=="") {
-			// Plain
-			layerhtml = runHook('ol_content_simple', FALTERNATE, o3_css, o3_text);
-		} else {
-			// With caption
-			if (o3_sticky) {
-				// Show close text
-				layerhtml = runHook('ol_content_caption', FALTERNATE, o3_css, o3_text, o3_cap, o3_close);
-			} else {
-				// No close text
-				layerhtml = runHook('ol_content_caption', FALTERNATE, o3_css, o3_text, o3_cap, "");
-			}
-		}
-	}	
-
-	// We want it to stick!
-	if (o3_sticky) {
-		if (o3_timerid > 0) {
-			clearTimeout(o3_timerid);
-			o3_timerid = 0;
-		}
-		o3_showingsticky = 1;
-		o3_removecounter = 0;
-	}
-
-	// Created a separate routine to generate the popup to make it easier
-	// to implement a plugin capability
-	if (!runHook("createPopup", FREPLACE, layerhtml)) return false;
-
-	// Prepare status bar
-	if (o3_autostatus > 0) {
-		o3_status = o3_text;
-		if (o3_autostatus > 1) o3_status = o3_cap;
-	}
-
-	// When placing the layer the first time, even stickies may be moved.
-	o3_allowmove = 0;
-
-	// Initiate a timer for timeout
-	if (o3_timeout > 0) {          
-		if (o3_timerid > 0) clearTimeout(o3_timerid);
-		o3_timerid = setTimeout("cClick()", o3_timeout);
-	}
-
-	// Show layer
-	runHook("disp", FREPLACE, o3_status);
-	runHook("olMain", FAFTER);
-
-	return (olOp && event && event.type == 'mouseover' && !o3_status) ? '' : (o3_status != '');
-}
-
-////////
-// LAYER GENERATION FUNCTIONS
-////////
-// These functions just handle popup content with tags that should adhere to the W3C standards specification.
-
-// Makes simple table without caption
-function ol_content_simple(text) {
-	var cpIsMultiple = /,/.test(o3_cellpad);
-	var txt = '<table width="'+o3_width+ '" border="0" cellpadding="'+o3_border+'" cellspacing="0" '+(o3_bgclass ? 'class="'+o3_bgclass+'"' : o3_bgcolor+' '+o3_height)+'><tr><td><table width="100%" border="0" '+((olNs4||!cpIsMultiple) ? 'cellpadding="'+o3_cellpad+'" ' : '')+'cellspacing="0" '+(o3_fgclass ? 'class="'+o3_fgclass+'"' : o3_fgcolor+' '+o3_fgbackground+' '+o3_height)+'><tr><td valign="TOP"'+(o3_textfontclass ? ' class="'+o3_textfontclass+'">' : ((!olNs4&&cpIsMultiple) ? ' style="'+setCellPadStr(o3_cellpad)+'">' : '>'))+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize))+'</td></tr></table></td></tr></table>';
-
-	set_background("");
-	return txt;
-}
-
-// Makes table with caption and optional close link
-function ol_content_caption(text,title,close) {
-	var nameId, txt, cpIsMultiple = /,/.test(o3_cellpad);
-	var closing, closeevent;
-
-	closing = "";
-	closeevent = "onmouseover";
-	if (o3_closeclick == 1) closeevent = (o3_closetitle ? "title='" + o3_closetitle +"'" : "") + " onclick";
-	if (o3_capicon != "") {
-	  nameId = ' hspace = \"5\"'+' align = \"middle\" alt = \"\"';
-	  if (typeof o3_dragimg != 'undefined' && o3_dragimg) nameId =' hspace=\"5\"'+' name=\"'+o3_dragimg+'\" id=\"'+o3_dragimg+'\" align=\"middle\" alt=\"Drag Enabled\" title=\"Drag Enabled\"';
-	  o3_capicon = '<img src=\"'+o3_capicon+'\"'+nameId+' />';
-	}
-
-	if (close != "")
-		closing = '<td '+(!o3_compatmode && o3_closefontclass ? 'class="'+o3_closefontclass : 'align="RIGHT')+'"><a href="javascript:return '+fnRef+'cClick();"'+((o3_compatmode && o3_closefontclass) ? ' class="' + o3_closefontclass + '" ' : ' ')+closeevent+'="return '+fnRef+'cClick();">'+(o3_closefontclass ? '' : wrapStr(0,o3_closesize,'close'))+close+(o3_closefontclass ? '' : wrapStr(1,o3_closesize,'close'))+'</a></td>';
-	txt = '<table width="'+o3_width+ '" border="0" cellpadding="'+o3_border+'" cellspacing="0" '+(o3_bgclass ? 'class="'+o3_bgclass+'"' : o3_bgcolor+' '+o3_bgbackground+' '+o3_height)+'><tr><td><table width="100%" border="0" cellpadding="2" cellspacing="0"><tr><td'+(o3_captionfontclass ? ' class="'+o3_captionfontclass+'">' : '>')+(o3_captionfontclass ? '' : '<b>'+wrapStr(0,o3_captionsize,'caption'))+o3_capicon+title+(o3_captionfontclass ? '' : wrapStr(1,o3_captionsize)+'</b>')+'</td>'+closing+'</tr></table><table width="100%" border="0" '+((olNs4||!cpIsMultiple) ? 'cellpadding="'+o3_cellpad+'" ' : '')+'cellspacing="0" '+(o3_fgclass ? 'class="'+o3_fgclass+'"' : o3_fgcolor+' '+o3_fgbackground+' '+o3_height)+'><tr><td valign="TOP"'+(o3_textfontclass ? ' class="'+o3_textfontclass+'">' :((!olNs4&&cpIsMultiple) ? ' style="'+setCellPadStr(o3_cellpad)+'">' : '>'))+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize)) + '</td></tr></table></td></tr></table>';
-
-	set_background("");
-	return txt;
-}
-
-// Sets the background picture,padding and lots more. :)
-function ol_content_background(text,picture,hasfullhtml) {
-	if (hasfullhtml) {
-		txt=text;
-	} else {
-		txt='<table width="'+o3_width+'" border="0" cellpadding="0" cellspacing="0" height="'+o3_height+'"><tr><td colspan="3" height="'+o3_padyt+'"></td></tr><tr><td width="'+o3_padxl+'"></td><td valign="TOP" width="'+(o3_width-o3_padxl-o3_padxr)+(o3_textfontclass ? '" class="'+o3_textfontclass : '')+'">'+(o3_textfontclass ? '' : wrapStr(0,o3_textsize,'text'))+text+(o3_textfontclass ? '' : wrapStr(1,o3_textsize))+'</td><td width="'+o3_padxr+'"></td></tr><tr><td colspan="3" height="'+o3_padyb+'"></td></tr></table>';
-	}
-
-	set_background(picture);
-	return txt;
-}
-
-// Loads a picture into the div.
-function set_background(pic) {
-	if (pic == "") {
-		if (olNs4) {
-			over.background.src = null; 
-		} else if (over.style) {
-			over.style.backgroundImage = "none";
-		}
-	} else {
-		if (olNs4) {
-			over.background.src = pic;
-		} else if (over.style) {
-			over.style.width=o3_width + 'px';
-			over.style.backgroundImage = "url("+pic+")";
-		}
-	}
-}
-
-////////
-// HANDLING FUNCTIONS
-////////
-var olShowId=-1;
-
-// Displays the popup
-function disp(statustext) {
-	runHook("disp", FBEFORE);
-	
-	if (o3_allowmove == 0) {
-		runHook("placeLayer", FREPLACE);
-		(olNs6&&olShowId<0) ? olShowId=setTimeout("runHook('showObject', FREPLACE, over)", 1) : runHook("showObject", FREPLACE, over);
-		o3_allowmove = (o3_sticky || o3_followmouse==0) ? 0 : 1;
-	}
-	
-	runHook("disp", FAFTER);
-
-	if (statustext != "") self.status = statustext;
-}
-
-// Creates the actual popup structure
-function createPopup(lyrContent){
-	runHook("createPopup", FBEFORE);
-	
-	if (o3_wrap) {
-		var wd,ww,theObj = (olNs4 ? over : over.style);
-		theObj.top = theObj.left = ((olIe4&&!olOp) ? 0 : -10000) + (!olNs4 ? 'px' : 0);
-		layerWrite(lyrContent);
-		wd = (olNs4 ? over.clip.width : over.offsetWidth);
-		if (wd > (ww=windowWidth())) {
-			lyrContent=lyrContent.replace(/\&nbsp;/g, ' ');
-			o3_width=ww;
-			o3_wrap=0;
-		} 
-	}
-
-	layerWrite(lyrContent);
-	
-	// Have to set o3_width for placeLayer() routine if o3_wrap is turned on
-	if (o3_wrap) o3_width=(olNs4 ? over.clip.width : over.offsetWidth);
-	
-	runHook("createPopup", FAFTER, lyrContent);
-
-	return true;
-}
-
-// Decides where we want the popup.
-function placeLayer() {
-	var placeX, placeY, widthFix = 0;
-	
-	// HORIZONTAL PLACEMENT, re-arranged to work in Safari
-	if (o3_frame.innerWidth) widthFix=18; 
-	iwidth = windowWidth();
-
-	// Horizontal scroll offset
-	winoffset=(olIe4) ? eval('o3_frame.'+docRoot+'.scrollLeft') : o3_frame.pageXOffset;
-
-	placeX = runHook('horizontalPlacement',FCHAIN,iwidth,winoffset,widthFix);
-
-	// VERTICAL PLACEMENT, re-arranged to work in Safari
-	if (o3_frame.innerHeight) {
-		iheight=o3_frame.innerHeight;
-	} else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientHeight=='number'")&&eval('o3_frame.'+docRoot+'.clientHeight')) { 
-		iheight=eval('o3_frame.'+docRoot+'.clientHeight');
-	}			
-
-	// Vertical scroll offset
-	scrolloffset=(olIe4) ? eval('o3_frame.'+docRoot+'.scrollTop') : o3_frame.pageYOffset;
-	placeY = runHook('verticalPlacement',FCHAIN,iheight,scrolloffset);
-
-	// Actually move the object.
-	repositionTo(over, placeX, placeY);
-}
-
-// Moves the layer
-function olMouseMove(e) {
-	var e = (e) ? e : event;
-
-	if (e.pageX) {
-		o3_x = e.pageX;
-		o3_y = e.pageY;
-	} else if (e.clientX) {
-		o3_x = eval('e.clientX+o3_frame.'+docRoot+'.scrollLeft');
-		o3_y = eval('e.clientY+o3_frame.'+docRoot+'.scrollTop');
-	}
-	
-	if (o3_allowmove == 1) runHook("placeLayer", FREPLACE);
-
-	// MouseOut handler
-	if (hoveringSwitch && !olNs4 && runHook("cursorOff", FREPLACE)) {
-		(olHideDelay ? hideDelay(olHideDelay) : cClick());
-		hoveringSwitch = !hoveringSwitch;
-	}
-}
-
-// Fake function for 3.0 users.
-function no_overlib() { return ver3fix; }
-
-// Capture the mouse and chain other scripts.
-function olMouseCapture() {
-	capExtent = document;
-	var fN, str = '', l, k, f, wMv, sS, mseHandler = olMouseMove;
-	var re = /function[ ]*(\w*)\(/;
-	
-	wMv = (!olIe4 && window.onmousemove);
-	if (document.onmousemove || wMv) {
-		if (wMv) capExtent = window;
-		f = capExtent.onmousemove.toString();
-		fN = f.match(re);
-		if (fN == null) {
-			str = f+'(e); ';
-		} else if (fN[1] == 'anonymous' || fN[1] == 'olMouseMove' || (wMv && fN[1] == 'onmousemove')) {
-			if (!olOp && wMv) {
-				l = f.indexOf('{')+1;
-				k = f.lastIndexOf('}');
-				sS = f.substring(l,k);
-				if ((l = sS.indexOf('(')) != -1) {
-					sS = sS.substring(0,l).replace(/^\s+/,'').replace(/\s+$/,'');
-					if (eval("typeof " + sS + " == 'undefined'")) window.onmousemove = null;
-					else str = sS + '(e);';
-				}
-			}
-			if (!str) {
-				olCheckMouseCapture = false;
-				return;
-			}
-		} else {
-			if (fN[1]) str = fN[1]+'(e); ';
-			else {
-				l = f.indexOf('{')+1;
-				k = f.lastIndexOf('}');
-				str = f.substring(l,k) + '\n';
-			}
-		}
-		str += 'olMouseMove(e); ';
-		mseHandler = new Function('e', str);
-	}
-
-	capExtent.onmousemove = mseHandler;
-	if (olNs4) capExtent.captureEvents(Event.MOUSEMOVE);
-}
-
-////////
-// PARSING FUNCTIONS
-////////
-
-// Does the actual command parsing.
-function parseTokens(pf, ar) {
-	// What the next argument is expected to be.
-	var v, i, mode=-1, par = (pf != 'ol_');	
-	var fnMark = (par && !ar.length ? 1 : 0);
-
-	for (i = 0; i < ar.length; i++) {
-		if (mode < 0) {
-			// Arg is maintext,unless its a number between pmStart and pmUpper
-			// then its a command.
-			if (typeof ar[i] == 'number' && ar[i] > pmStart && ar[i] < pmUpper) {
-				fnMark = (par ? 1 : 0);
-				i--;   // backup one so that the next block can parse it
-			} else {
-				switch(pf) {
-					case 'ol_':
-						ol_text = ar[i].toString();
-						break;
-					default:
-						o3_text=ar[i].toString();  
-				}
-			}
-			mode = 0;
-		} else {
-			// Note: NS4 doesn't like switch cases with vars.
-			if (ar[i] >= pmCount || ar[i]==DONOTHING) { continue; }
-			if (ar[i]==INARRAY) { fnMark = 0; eval(pf+'text=ol_texts['+ar[++i]+'].toString()'); continue; }
-			if (ar[i]==CAPARRAY) { eval(pf+'cap=ol_caps['+ar[++i]+'].toString()'); continue; }
-			if (ar[i]==STICKY) { if (pf!='ol_') eval(pf+'sticky=1'); continue; }
-			if (ar[i]==BACKGROUND) { eval(pf+'background="'+ar[++i]+'"'); continue; }
-			if (ar[i]==NOCLOSE) { if (pf!='ol_') opt_NOCLOSE(); continue; }
-			if (ar[i]==CAPTION) { eval(pf+"cap='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==CENTER || ar[i]==LEFT || ar[i]==RIGHT) { eval(pf+'hpos='+ar[i]); if(pf!='ol_') olHautoFlag=1; continue; }
-			if (ar[i]==OFFSETX) { eval(pf+'offsetx='+ar[++i]); continue; }
-			if (ar[i]==OFFSETY) { eval(pf+'offsety='+ar[++i]); continue; }
-			if (ar[i]==FGCOLOR) { eval(pf+'fgcolor="'+ar[++i]+'"'); continue; }
-			if (ar[i]==BGCOLOR) { eval(pf+'bgcolor="'+ar[++i]+'"'); continue; }
-			if (ar[i]==TEXTCOLOR) { eval(pf+'textcolor="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CAPCOLOR) { eval(pf+'capcolor="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CLOSECOLOR) { eval(pf+'closecolor="'+ar[++i]+'"'); continue; }
-			if (ar[i]==WIDTH) { eval(pf+'width='+ar[++i]); continue; }
-			if (ar[i]==BORDER) { eval(pf+'border='+ar[++i]); continue; }
-			if (ar[i]==CELLPAD) { i=opt_MULTIPLEARGS(++i,ar,(pf+'cellpad')); continue; }
-			if (ar[i]==STATUS) { eval(pf+"status='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==AUTOSTATUS) { eval(pf +'autostatus=('+pf+'autostatus == 1) ? 0 : 1'); continue; }
-			if (ar[i]==AUTOSTATUSCAP) { eval(pf +'autostatus=('+pf+'autostatus == 2) ? 0 : 2'); continue; }
-			if (ar[i]==HEIGHT) { eval(pf+'height='+pf+'aboveheight='+ar[++i]); continue; } // Same param again.
-			if (ar[i]==CLOSETEXT) { eval(pf+"close='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==SNAPX) { eval(pf+'snapx='+ar[++i]); continue; }
-			if (ar[i]==SNAPY) { eval(pf+'snapy='+ar[++i]); continue; }
-			if (ar[i]==FIXX) { eval(pf+'fixx='+ar[++i]); continue; }
-			if (ar[i]==FIXY) { eval(pf+'fixy='+ar[++i]); continue; }
-			if (ar[i]==RELX) { eval(pf+'relx='+ar[++i]); continue; }
-			if (ar[i]==RELY) { eval(pf+'rely='+ar[++i]); continue; }
-			if (ar[i]==FGBACKGROUND) { eval(pf+'fgbackground="'+ar[++i]+'"'); continue; }
-			if (ar[i]==BGBACKGROUND) { eval(pf+'bgbackground="'+ar[++i]+'"'); continue; }
-			if (ar[i]==PADX) { eval(pf+'padxl='+ar[++i]); eval(pf+'padxr='+ar[++i]); continue; }
-			if (ar[i]==PADY) { eval(pf+'padyt='+ar[++i]); eval(pf+'padyb='+ar[++i]); continue; }
-			if (ar[i]==FULLHTML) { if (pf!='ol_') eval(pf+'fullhtml=1'); continue; }
-			if (ar[i]==BELOW || ar[i]==ABOVE) { eval(pf+'vpos='+ar[i]); if (pf!='ol_') olVautoFlag=1; continue; }
-			if (ar[i]==CAPICON) { eval(pf+'capicon="'+ar[++i]+'"'); continue; }
-			if (ar[i]==TEXTFONT) { eval(pf+"textfont='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==CAPTIONFONT) { eval(pf+"captionfont='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==CLOSEFONT) { eval(pf+"closefont='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==TEXTSIZE) { eval(pf+'textsize="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CAPTIONSIZE) { eval(pf+'captionsize="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CLOSESIZE) { eval(pf+'closesize="'+ar[++i]+'"'); continue; }
-			if (ar[i]==TIMEOUT) { eval(pf+'timeout='+ar[++i]); continue; }
-			if (ar[i]==FUNCTION) { if (pf=='ol_') { if (typeof ar[i+1]!='number') { v=ar[++i]; ol_function=(typeof v=='function' ? v : null); }} else {fnMark = 0; v = null; if (typeof ar[i+1]!='number') v = ar[++i];  opt_FUNCTION(v); } continue; }
-			if (ar[i]==DELAY) { eval(pf+'delay='+ar[++i]); continue; }
-			if (ar[i]==HAUTO) { eval(pf+'hauto=('+pf+'hauto == 0) ? 1 : 0'); continue; }
-			if (ar[i]==VAUTO) { eval(pf+'vauto=('+pf+'vauto == 0) ? 1 : 0'); continue; }
-			if (ar[i]==CLOSECLICK) { eval(pf +'closeclick=('+pf+'closeclick == 0) ? 1 : 0'); continue; }
-			if (ar[i]==WRAP) { eval(pf +'wrap=('+pf+'wrap == 0) ? 1 : 0'); continue; }
-			if (ar[i]==FOLLOWMOUSE) { eval(pf +'followmouse=('+pf+'followmouse == 1) ? 0 : 1'); continue; }
-			if (ar[i]==MOUSEOFF) { eval(pf +'mouseoff=('+pf+'mouseoff==0) ? 1 : 0'); v=ar[i+1]; if (pf != 'ol_' && eval(pf+'mouseoff') && typeof v == 'number' && (v < pmStart || v > pmUpper)) olHideDelay=ar[++i]; continue; }
-			if (ar[i]==CLOSETITLE) { eval(pf+"closetitle='"+escSglQuote(ar[++i])+"'"); continue; }
-			if (ar[i]==CSSOFF||ar[i]==CSSCLASS) { eval(pf+'css='+ar[i]); continue; }
-			if (ar[i]==COMPATMODE) { eval(pf+'compatmode=('+pf+'compatmode==0) ? 1 : 0'); continue; }
-			if (ar[i]==FGCLASS) { eval(pf+'fgclass="'+ar[++i]+'"'); continue; }
-			if (ar[i]==BGCLASS) { eval(pf+'bgclass="'+ar[++i]+'"'); continue; }
-			if (ar[i]==TEXTFONTCLASS) { eval(pf+'textfontclass="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CAPTIONFONTCLASS) { eval(pf+'captionfontclass="'+ar[++i]+'"'); continue; }
-			if (ar[i]==CLOSEFONTCLASS) { eval(pf+'closefontclass="'+ar[++i]+'"'); continue; }
-			i = parseCmdLine(pf, i, ar);
-		}
-	}
-
-	if (fnMark && o3_function) o3_text = o3_function();
-	
-	if ((pf == 'o3_') && o3_wrap) {
-		o3_width = 0;
-		
-		var tReg=/<.*\n*>/ig;
-		if (!tReg.test(o3_text)) o3_text = o3_text.replace(/[ ]+/g, '&nbsp;');
-		if (!tReg.test(o3_cap))o3_cap = o3_cap.replace(/[ ]+/g, '&nbsp;');
-	}
-	if ((pf == 'o3_') && o3_sticky) {
-		if (!o3_close && (o3_frame != ol_frame)) o3_close = ol_close;
-		if (o3_mouseoff && (o3_frame == ol_frame)) opt_NOCLOSE(' ');
-	}
-}
-
-
-////////
-// LAYER FUNCTIONS
-////////
-
-// Writes to a layer
-function layerWrite(txt) {
-	txt += "\n";
-	if (olNs4) {
-		var lyr = o3_frame.document.layers['overDiv'].document
-		lyr.write(txt)
-		lyr.close()
-	} else if (typeof over.innerHTML != 'undefined') {
-		if (olIe5 && isMac) over.innerHTML = '';
-		over.innerHTML = txt;
-	} else {
-		range = o3_frame.document.createRange();
-		range.setStartAfter(over);
-		domfrag = range.createContextualFragment(txt);
-		
-		while (over.hasChildNodes()) {
-			over.removeChild(over.lastChild);
-		}
-		
-		over.appendChild(domfrag);
-	}
-}
-
-// Make an object visible
-function showObject(obj) {
-	runHook("showObject", FBEFORE);
-
-	var theObj=(olNs4 ? obj : obj.style);
-	theObj.visibility = 'visible';
-
-	runHook("showObject", FAFTER);
-}
-
-// Hides an object
-function hideObject(obj) {
-	runHook("hideObject", FBEFORE);
-
-	var theObj=(olNs4 ? obj : obj.style);
-	if (olNs6 && olShowId>0) { clearTimeout(olShowId); olShowId=0; }
-	theObj.visibility = 'hidden';
-	theObj.top = theObj.left = ((olIe4&&!olOp) ? 0 : -10000) + (!olNs4 ? 'px' : 0);
-
-	if (o3_timerid > 0) clearTimeout(o3_timerid);
-	if (o3_delayid > 0) clearTimeout(o3_delayid);
-
-	o3_timerid = 0;
-	o3_delayid = 0;
-	self.status = "";
-
-	if (obj.onmouseout||obj.onmouseover) {
-		if (olNs4) obj.releaseEvents(Event.MOUSEOUT || Event.MOUSEOVER);
-		obj.onmouseout = obj.onmouseover = null;
-	}
-
-	runHook("hideObject", FAFTER);
-}
-
-// Move a layer
-function repositionTo(obj, xL, yL) {
-	var theObj=(olNs4 ? obj : obj.style);
-	theObj.left = xL + (!olNs4 ? 'px' : 0);
-	theObj.top = yL + (!olNs4 ? 'px' : 0);
-}
-
-// Check position of cursor relative to overDiv DIVision; mouseOut function
-function cursorOff() {
-	var left = parseInt(over.style.left);
-	var top = parseInt(over.style.top);
-	var right = left + (over.offsetWidth >= parseInt(o3_width) ? over.offsetWidth : parseInt(o3_width));
-	var bottom = top + (over.offsetHeight >= o3_aboveheight ? over.offsetHeight : o3_aboveheight);
-
-	if (o3_x < left || o3_x > right || o3_y < top || o3_y > bottom) return true;
-
-	return false;
-}
-
-
-////////
-// COMMAND FUNCTIONS
-////////
-
-// Calls callme or the default function.
-function opt_FUNCTION(callme) {
-	o3_text = (callme ? (typeof callme=='string' ? (/.+\(.*\)/.test(callme) ? eval(callme) : callme) : callme()) : (o3_function ? o3_function() : 'No Function'));
-
-	return 0;
-}
-
-// Handle hovering
-function opt_NOCLOSE(unused) {
-	if (!unused) o3_close = "";
-
-	if (olNs4) {
-		over.captureEvents(Event.MOUSEOUT || Event.MOUSEOVER);
-		over.onmouseover = function () { if (o3_timerid > 0) { clearTimeout(o3_timerid); o3_timerid = 0; } }
-		over.onmouseout = function (e) { if (olHideDelay) hideDelay(olHideDelay); else cClick(e); }
-	} else {
-		over.onmouseover = function () {hoveringSwitch = true; if (o3_timerid > 0) { clearTimeout(o3_timerid); o3_timerid =0; } }
-	}
-
-	return 0;
-}
-
-// Function to scan command line arguments for multiples
-function opt_MULTIPLEARGS(i, args, parameter) {
-  var k=i, re, pV, str='';
-
-  for(k=i; k<args.length; k++) {
-		if(typeof args[k] == 'number' && args[k]>pmStart) break;
-		str += args[k] + ',';
-	}
-	if (str) str = str.substring(0,--str.length);
-
-	k--;  // reduce by one so the for loop this is in works correctly
-	pV=(olNs4 && /cellpad/i.test(parameter)) ? str.split(',')[0] : str;
-	eval(parameter + '="' + pV + '"');
-
-	return k;
-}
-
-// Remove &nbsp; in texts when done.
-function nbspCleanup() {
-	if (o3_wrap) {
-		o3_text = o3_text.replace(/\&nbsp;/g, ' ');
-		o3_cap = o3_cap.replace(/\&nbsp;/g, ' ');
-	}
-}
-
-// Escape embedded single quotes in text strings
-function escSglQuote(str) {
-  return str.toString().replace(/'/g,"\\'");
-}
-
-// Onload handler for window onload event
-function OLonLoad_handler(e) {
-	var re = /\w+\(.*\)[;\s]+/g, olre = /overlib\(|nd\(|cClick\(/, fn, l, i;
-
-	if(!olLoaded) olLoaded=1;
-
-  // Remove it for Gecko based browsers
-	if(window.removeEventListener && e.eventPhase == 3) window.removeEventListener("load",OLonLoad_handler,false);
-	else if(window.detachEvent) { // and for IE and Opera 4.x but execute calls to overlib, nd, or cClick()
-		window.detachEvent("onload",OLonLoad_handler);
-		var fN = document.body.getAttribute('onload');
-		if (fN) {
-			fN=fN.toString().match(re);
-			if (fN && fN.length) {
-				for (i=0; i<fN.length; i++) {
-					if (/anonymous/.test(fN[i])) continue;
-					while((l=fN[i].search(/\)[;\s]+/)) != -1) {
-						fn=fN[i].substring(0,l+1);
-						fN[i] = fN[i].substring(l+2);
-						if (olre.test(fn)) eval(fn);
-					}
-				}
-			}
-		}
-	}
-}
-
-// Wraps strings in Layer Generation Functions with the correct tags
-//    endWrap true(if end tag) or false if start tag
-//    fontSizeStr - font size string such as '1' or '10px'
-//    whichString is being wrapped -- 'text', 'caption', or 'close'
-function wrapStr(endWrap,fontSizeStr,whichString) {
-	var fontStr, fontColor, isClose=((whichString=='close') ? 1 : 0), hasDims=/[%\-a-z]+$/.test(fontSizeStr);
-	fontSizeStr = (olNs4) ? (!hasDims ? fontSizeStr : '1') : fontSizeStr;
-	if (endWrap) return (hasDims&&!olNs4) ? (isClose ? '</span>' : '</div>') : '</font>';
-	else {
-		fontStr='o3_'+whichString+'font';
-		fontColor='o3_'+((whichString=='caption')? 'cap' : whichString)+'color';
-		return (hasDims&&!olNs4) ? (isClose ? '<span style="font-family: '+quoteMultiNameFonts(eval(fontStr))+'; color: '+eval(fontColor)+'; font-size: '+fontSizeStr+';">' : '<div style="font-family: '+quoteMultiNameFonts(eval(fontStr))+'; color: '+eval(fontColor)+'; font-size: '+fontSizeStr+';">') : '<font face="'+eval(fontStr)+'" color="'+eval(fontColor)+'" size="'+(parseInt(fontSizeStr)>7 ? '7' : fontSizeStr)+'">';
-	}
-}
-
-// Quotes Multi word font names; needed for CSS Standards adherence in font-family
-function quoteMultiNameFonts(theFont) {
-	var v, pM=theFont.split(',');
-	for (var i=0; i<pM.length; i++) {
-		v=pM[i];
-		v=v.replace(/^\s+/,'').replace(/\s+$/,'');
-		if(/\s/.test(v) && !/['"]/.test(v)) {
-			v="\'"+v+"\'";
-			pM[i]=v;
-		}
-	}
-	return pM.join();
-}
-
-// dummy function which will be overridden 
-function isExclusive(args) {
-	return false;
-}
-
-// Sets cellpadding style string value
-function setCellPadStr(parameter) {
-	var Str='', j=0, ary = new Array(), top, bottom, left, right;
-
-	Str+='padding: ';
-	ary=parameter.replace(/\s+/g,'').split(',');
-
-	switch(ary.length) {
-		case 2:
-			top=bottom=ary[j];
-			left=right=ary[++j];
-			break;
-		case 3:
-			top=ary[j];
-			left=right=ary[++j];
-			bottom=ary[++j];
-			break;
-		case 4:
-			top=ary[j];
-			right=ary[++j];
-			bottom=ary[++j];
-			left=ary[++j];
-			break;
-	}
-
-	Str+= ((ary.length==1) ? ary[0] + 'px;' : top + 'px ' + right + 'px ' + bottom + 'px ' + left + 'px;');
-
-	return Str;
-}
-
-// function will delay close by time milliseconds
-function hideDelay(time) {
-	if (time&&!o3_delay) {
-		if (o3_timerid > 0) clearTimeout(o3_timerid);
-
-		o3_timerid=setTimeout("cClick()",(o3_timeout=time));
-	}
-}
-
-// Was originally in the placeLayer() routine; separated out for future ease
-function horizontalPlacement(browserWidth, horizontalScrollAmount, widthFix) {
-	var placeX, iwidth=browserWidth, winoffset=horizontalScrollAmount;
-	var parsedWidth = parseInt(o3_width);
-
-	if (o3_fixx > -1 || o3_relx != null) {
-		// Fixed position
-		placeX=(o3_relx != null ? ( o3_relx < 0 ? winoffset +o3_relx+ iwidth - parsedWidth - widthFix : winoffset+o3_relx) : o3_fixx);
-	} else {  
-		// If HAUTO, decide what to use.
-		if (o3_hauto == 1) {
-			if ((o3_x - winoffset) > (iwidth / 2)) {
-				o3_hpos = LEFT;
-			} else {
-				o3_hpos = RIGHT;
-			}
-		}  		
-
-		// From mouse
-		if (o3_hpos == CENTER) { // Center
-			placeX = o3_x+o3_offsetx-(parsedWidth/2);
-
-			if (placeX < winoffset) placeX = winoffset;
-		}
-
-		if (o3_hpos == RIGHT) { // Right
-			placeX = o3_x+o3_offsetx;
-
-			if ((placeX+parsedWidth) > (winoffset+iwidth - widthFix)) {
-				placeX = iwidth+winoffset - parsedWidth - widthFix;
-				if (placeX < 0) placeX = 0;
-			}
-		}
-		if (o3_hpos == LEFT) { // Left
-			placeX = o3_x-o3_offsetx-parsedWidth;
-			if (placeX < winoffset) placeX = winoffset;
-		}  	
-
-		// Snapping!
-		if (o3_snapx > 1) {
-			var snapping = placeX % o3_snapx;
-
-			if (o3_hpos == LEFT) {
-				placeX = placeX - (o3_snapx+snapping);
-			} else {
-				// CENTER and RIGHT
-				placeX = placeX+(o3_snapx - snapping);
-			}
-
-			if (placeX < winoffset) placeX = winoffset;
-		}
-	}	
-
-	return placeX;
-}
-
-// was originally in the placeLayer() routine; separated out for future ease
-function verticalPlacement(browserHeight,verticalScrollAmount) {
-	var placeY, iheight=browserHeight, scrolloffset=verticalScrollAmount;
-	var parsedHeight=(o3_aboveheight ? parseInt(o3_aboveheight) : (olNs4 ? over.clip.height : over.offsetHeight));
-
-	if (o3_fixy > -1 || o3_rely != null) {
-		// Fixed position
-		placeY=(o3_rely != null ? (o3_rely < 0 ? scrolloffset+o3_rely+iheight - parsedHeight : scrolloffset+o3_rely) : o3_fixy);
-	} else {
-		// If VAUTO, decide what to use.
-		if (o3_vauto == 1) {
-			if ((o3_y - scrolloffset) > (iheight / 2) && o3_vpos == BELOW && (o3_y + parsedHeight + o3_offsety - (scrolloffset + iheight) > 0)) {
-				o3_vpos = ABOVE;
-			} else if (o3_vpos == ABOVE && (o3_y - (parsedHeight + o3_offsety) - scrolloffset < 0)) {
-				o3_vpos = BELOW;
-			}
-		}
-
-		// From mouse
-		if (o3_vpos == ABOVE) {
-			if (o3_aboveheight == 0) o3_aboveheight = parsedHeight; 
-
-			placeY = o3_y - (o3_aboveheight+o3_offsety);
-			if (placeY < scrolloffset) placeY = scrolloffset;
-		} else {
-			// BELOW
-			placeY = o3_y+o3_offsety;
-		} 
-
-		// Snapping!
-		if (o3_snapy > 1) {
-			var snapping = placeY % o3_snapy;  			
-
-			if (o3_aboveheight > 0 && o3_vpos == ABOVE) {
-				placeY = placeY - (o3_snapy+snapping);
-			} else {
-				placeY = placeY+(o3_snapy - snapping);
-			} 			
-
-			if (placeY < scrolloffset) placeY = scrolloffset;
-		}
-	}
-
-	return placeY;
-}
-
-// checks positioning flags
-function checkPositionFlags() {
-	if (olHautoFlag) olHautoFlag = o3_hauto=0;
-	if (olVautoFlag) olVautoFlag = o3_vauto=0;
-	return true;
-}
-
-// get Browser window width
-function windowWidth() {
-	var w;
-	if (o3_frame.innerWidth) w=o3_frame.innerWidth;
-	else if (eval('o3_frame.'+docRoot)&&eval("typeof o3_frame."+docRoot+".clientWidth=='number'")&&eval('o3_frame.'+docRoot+'.clientWidth')) 
-		w=eval('o3_frame.'+docRoot+'.clientWidth');
-	return w;			
-}
-
-// create the div container for popup content if it doesn't exist
-function createDivContainer(id,frm,zValue) {
-	id = (id || 'overDiv'), frm = (frm || o3_frame), zValue = (zValue || 1000);
-	var objRef, divContainer = layerReference(id);
-
-	if (divContainer == null) {
-		if (olNs4) {
-			divContainer = frm.document.layers[id] = new Layer(window.innerWidth, frm);
-			objRef = divContainer;
-		} else {
-			var body = (olIe4 ? frm.document.all.tags('BODY')[0] : frm.document.getElementsByTagName("BODY")[0]);
-			if (olIe4&&!document.getElementById) {
-				body.insertAdjacentHTML("beforeEnd",'<div id="'+id+'"></div>');
-				divContainer=layerReference(id);
-			} else {
-				divContainer = frm.document.createElement("DIV");
-				divContainer.id = id;
-				body.appendChild(divContainer);
-			}
-			objRef = divContainer.style;
-		}
-
-		objRef.position = 'absolute';
-		objRef.visibility = 'hidden';
-		objRef.zIndex = zValue;
-		if (olIe4&&!olOp) objRef.left = objRef.top = '0px';
-		else objRef.left = objRef.top =  -10000 + (!olNs4 ? 'px' : 0);
-	}
-
-	return divContainer;
-}
-
-// get reference to a layer with ID=id
-function layerReference(id) {
-	return (olNs4 ? o3_frame.document.layers[id] : (document.all ? o3_frame.document.all[id] : o3_frame.document.getElementById(id)));
-}
-////////
-//  UTILITY FUNCTIONS
-////////
-
-// Checks if something is a function.
-function isFunction(fnRef) {
-	var rtn = true;
-
-	if (typeof fnRef == 'object') {
-		for (var i = 0; i < fnRef.length; i++) {
-			if (typeof fnRef[i]=='function') continue;
-			rtn = false;
-			break;
-		}
-	} else if (typeof fnRef != 'function') {
-		rtn = false;
-	}
-	
-	return rtn;
-}
-
-// Converts an array into an argument string for use in eval.
-function argToString(array, strtInd, argName) {
-	var jS = strtInd, aS = '', ar = array;
-	argName=(argName ? argName : 'ar');
-	
-	if (ar.length > jS) {
-		for (var k = jS; k < ar.length; k++) aS += argName+'['+k+'], ';
-		aS = aS.substring(0, aS.length-2);
-	}
-	
-	return aS;
-}
-
-// Places a hook in the correct position in a hook point.
-function reOrder(hookPt, fnRef, order) {
-	var newPt = new Array(), match, i, j;
-
-	if (!order || typeof order == 'undefined' || typeof order == 'number') return hookPt;
-	
-	if (typeof order=='function') {
-		if (typeof fnRef=='object') {
-			newPt = newPt.concat(fnRef);
-		} else {
-			newPt[newPt.length++]=fnRef;
-		}
-		
-		for (i = 0; i < hookPt.length; i++) {
-			match = false;
-			if (typeof fnRef == 'function' && hookPt[i] == fnRef) {
-				continue;
-			} else {
-				for(j = 0; j < fnRef.length; j++) if (hookPt[i] == fnRef[j]) {
-					match = true;
-					break;
-				}
-			}
-			if (!match) newPt[newPt.length++] = hookPt[i];
-		}
-
-		newPt[newPt.length++] = order;
-
-	} else if (typeof order == 'object') {
-		if (typeof fnRef == 'object') {
-			newPt = newPt.concat(fnRef);
-		} else {
-			newPt[newPt.length++] = fnRef;
-		}
-		
-		for (j = 0; j < hookPt.length; j++) {
-			match = false;
-			if (typeof fnRef == 'function' && hookPt[j] == fnRef) {
-				continue;
-			} else {
-				for (i = 0; i < fnRef.length; i++) if (hookPt[j] == fnRef[i]) {
-					match = true;
-					break;
-				}
-			}
-			if (!match) newPt[newPt.length++]=hookPt[j];
-		}
-
-		for (i = 0; i < newPt.length; i++) hookPt[i] = newPt[i];
-		newPt.length = 0;
-		
-		for (j = 0; j < hookPt.length; j++) {
-			match = false;
-			for (i = 0; i < order.length; i++) {
-				if (hookPt[j] == order[i]) {
-					match = true;
-					break;
-				}
-			}
-			if (!match) newPt[newPt.length++] = hookPt[j];
-		}
-		newPt = newPt.concat(order);
-	}
-
-	hookPt = newPt;
-
-	return hookPt;
-}
-
-////////
-//  PLUGIN ACTIVATION FUNCTIONS
-////////
-
-// Runs plugin functions to set runtime variables.
-function setRunTimeVariables(){
-	if (typeof runTime != 'undefined' && runTime.length) {
-		for (var k = 0; k < runTime.length; k++) {
-			runTime[k]();
-		}
-	}
-}
-
-// Runs plugin functions to parse commands.
-function parseCmdLine(pf, i, args) {
-	if (typeof cmdLine != 'undefined' && cmdLine.length) { 
-		for (var k = 0; k < cmdLine.length; k++) { 
-			var j = cmdLine[k](pf, i, args);
-			if (j >- 1) {
-				i = j;
-				break;
-			}
-		}
-	}
-
-	return i;
-}
-
-// Runs plugin functions to do things after parse.
-function postParseChecks(pf,args){
-	if (typeof postParse != 'undefined' && postParse.length) {
-		for (var k = 0; k < postParse.length; k++) {
-			if (postParse[k](pf,args)) continue;
-			return false;  // end now since have an error
-		}
-	}
-	return true;
-}
-
-
-////////
-//  PLUGIN REGISTRATION FUNCTIONS
-////////
-
-// Registers commands and creates constants.
-function registerCommands(cmdStr) {
-	if (typeof cmdStr!='string') return;
-
-	var pM = cmdStr.split(',');
-	pms = pms.concat(pM);
-
-	for (var i = 0; i< pM.length; i++) {
-		eval(pM[i].toUpperCase()+'='+pmCount++);
-	}
-}
-
-// Registers no-parameter commands
-function registerNoParameterCommands(cmdStr) {
-	if (!cmdStr && typeof cmdStr != 'string') return;
-	pmt=(!pmt) ? cmdStr : pmt + ',' + cmdStr;
-}
-
-// Register a function to hook at a certain point.
-function registerHook(fnHookTo, fnRef, hookType, optPm) {
-	var hookPt, last = typeof optPm;
-	
-	if (fnHookTo == 'plgIn'||fnHookTo == 'postParse') return;
-	if (typeof hookPts[fnHookTo] == 'undefined') hookPts[fnHookTo] = new FunctionReference();
-
-	hookPt = hookPts[fnHookTo];
-
-	if (hookType != null) {
-		if (hookType == FREPLACE) {
-			hookPt.ovload = fnRef;  // replace normal overlib routine
-			if (fnHookTo.indexOf('ol_content_') > -1) hookPt.alt[pms[CSSOFF-1-pmStart]]=fnRef; 
-
-		} else if (hookType == FBEFORE || hookType == FAFTER) {
-			var hookPt=(hookType == 1 ? hookPt.before : hookPt.after);
-
-			if (typeof fnRef == 'object') {
-				hookPt = hookPt.concat(fnRef);
-			} else {
-				hookPt[hookPt.length++] = fnRef;
-			}
-
-			if (optPm) hookPt = reOrder(hookPt, fnRef, optPm);
-
-		} else if (hookType == FALTERNATE) {
-			if (last=='number') hookPt.alt[pms[optPm-1-pmStart]] = fnRef;
-		} else if (hookType == FCHAIN) {
-			hookPt = hookPt.chain; 
-			if (typeof fnRef=='object') hookPt=hookPt.concat(fnRef); // add other functions 
-			else hookPt[hookPt.length++]=fnRef;
-		}
-
-		return;
-	}
-}
-
-// Register a function that will set runtime variables.
-function registerRunTimeFunction(fn) {
-	if (isFunction(fn)) {
-		if (typeof fn == 'object') {
-			runTime = runTime.concat(fn);
-		} else {
-			runTime[runTime.length++] = fn;
-		}
-	}
-}
-
-// Register a function that will handle command parsing.
-function registerCmdLineFunction(fn){
-	if (isFunction(fn)) {
-		if (typeof fn == 'object') {
-			cmdLine = cmdLine.concat(fn);
-		} else {
-			cmdLine[cmdLine.length++] = fn;
-		}
-	}
-}
-
-// Register a function that does things after command parsing. 
-function registerPostParseFunction(fn){
-	if (isFunction(fn)) {
-		if (typeof fn == 'object') {
-			postParse = postParse.concat(fn);
-		} else {
-			postParse[postParse.length++] = fn;
-		}
-	}
-}
-
-////////
-//  PLUGIN REGISTRATION FUNCTIONS
-////////
-
-// Runs any hooks registered.
-function runHook(fnHookTo, hookType) {
-	var l = hookPts[fnHookTo], k, rtnVal = null, optPm, arS, ar = runHook.arguments;
-
-	if (hookType == FREPLACE) {
-		arS = argToString(ar, 2);
-
-		if (typeof l == 'undefined' || !(l = l.ovload)) rtnVal = eval(fnHookTo+'('+arS+')');
-		else rtnVal = eval('l('+arS+')');
-
-	} else if (hookType == FBEFORE || hookType == FAFTER) {
-		if (typeof l != 'undefined') {
-			l=(hookType == 1 ? l.before : l.after);
-	
-			if (l.length) {
-				arS = argToString(ar, 2);
-				for (var k = 0; k < l.length; k++) eval('l[k]('+arS+')');
-			}
-		}
-	} else if (hookType == FALTERNATE) {
-		optPm = ar[2];
-		arS = argToString(ar, 3);
-
-		if (typeof l == 'undefined' || (l = l.alt[pms[optPm-1-pmStart]]) == 'undefined') {
-			rtnVal = eval(fnHookTo+'('+arS+')');
-		} else {
-			rtnVal = eval('l('+arS+')');
-		}
-	} else if (hookType == FCHAIN) {
-		arS=argToString(ar,2);
-		l=l.chain;
-
-		for (k=l.length; k > 0; k--) if((rtnVal=eval('l[k-1]('+arS+')'))!=void(0)) break;
-	}
-
-	return rtnVal;
-}
-
-////////
-// OBJECT CONSTRUCTORS
-////////
-
-// Object for handling hooks.
-function FunctionReference() {
-	this.ovload = null;
-	this.before = new Array();
-	this.after = new Array();
-	this.alt = new Array();
-	this.chain = new Array();
-}
-
-// Object for simple access to the overLIB version used.
-// Examples: simpleversion:351 major:3 minor:5 revision:1
-function Info(version, prerelease) {
-	this.version = version;
-	this.prerelease = prerelease;
-
-	this.simpleversion = Math.round(this.version*100);
-	this.major = parseInt(this.simpleversion / 100);
-	this.minor = parseInt(this.simpleversion / 10) - this.major * 10;
-	this.revision = parseInt(this.simpleversion) - this.major * 100 - this.minor * 10;
-	this.meets = meets;
-}
-
-// checks for Core Version required
-function meets(reqdVersion) {
-	return (!reqdVersion) ? false : this.simpleversion >= Math.round(100*parseFloat(reqdVersion));
-}
-
-
-////////
-// STANDARD REGISTRATIONS
-////////
-registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSOFF);
-registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSOFF);
-registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSOFF);
-registerHook("ol_content_simple", ol_content_simple, FALTERNATE, CSSCLASS);
-registerHook("ol_content_caption", ol_content_caption, FALTERNATE, CSSCLASS);
-registerHook("ol_content_background", ol_content_background, FALTERNATE, CSSCLASS);
-registerPostParseFunction(checkPositionFlags);
-registerHook("hideObject", nbspCleanup, FAFTER);
-registerHook("horizontalPlacement", horizontalPlacement, FCHAIN);
-registerHook("verticalPlacement", verticalPlacement, FCHAIN);
-if (olNs4||(olIe5&&isMac)||olKq) olLoaded=1;
-registerNoParameterCommands('sticky,autostatus,autostatuscap,fullhtml,hauto,vauto,closeclick,wrap,followmouse,mouseoff,compatmode');
-///////
-// ESTABLISH MOUSECAPTURING
-///////
-
-// Capture events, alt. diffuses the overlib function.
-var olCheckMouseCapture=true;
-if ((olNs4 || olNs6 || olIe4)) {
-	olMouseCapture();
-} else {
-	overlib = no_overlib;
-	nd = no_overlib;
-	ver3fix = true;
-}
diff --git a/net-p2p/torrentflux/files/patch-html+admin.php b/net-p2p/torrentflux/files/patch-html+admin.php
deleted file mode 100644
index 4ebbd05d3d52..000000000000
--- a/net-p2p/torrentflux/files/patch-html+admin.php
+++ /dev/null
@@ -1,12 +0,0 @@
---- html/admin.php.orig	Fri Sep 30 19:40:51 2005
-+++ html/admin.php	Sun Oct  2 01:48:40 2005
-@@ -212,6 +212,9 @@
- 		case "mysql":
- 			$sCommand = "mysqldump -h ".$cfg["db_host"]." -u ".$cfg["db_user"]." --password=".$cfg["db_pass"]." --all -f ".$cfg["db_name"]." > ".$sql_file;
- 			break;
-+		case "sqlite":
-+			$sCommand = "sqlite ".$cfg["db_host"]." .dump > ".$sql_file;
-+			break;
- 		default:
- 			// no support for backup-on-demand.
- 			$sCommand = "";
diff --git a/net-p2p/torrentflux/files/patch-html+all_services.php b/net-p2p/torrentflux/files/patch-html+all_services.php
deleted file mode 100644
index d743d8fc29b6..000000000000
--- a/net-p2p/torrentflux/files/patch-html+all_services.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/all_services.php.orig	Wed Sep 28 19:33:42 2005
-+++ html/all_services.php	Wed Sep 28 19:34:20 2005
-@@ -28,7 +28,7 @@
- $result = shell_exec("df -h ".$cfg["path"]);
- $result2 = shell_exec("du -sh ".$cfg["path"]."*");
- $result4 = shell_exec("w");
--$result5 = shell_exec("free -mo");
-+$result5 = shell_exec("pstat -T");
- 
- DisplayHead(_ALL);
- echo "<table width=\"740\" border=0 cellpadding=0 cellspacing=0><tr><td>";
diff --git a/net-p2p/torrentflux/files/patch-html+config.php b/net-p2p/torrentflux/files/patch-html+config.php
deleted file mode 100644
index 83dc0606f6af..000000000000
--- a/net-p2p/torrentflux/files/patch-html+config.php
+++ /dev/null
@@ -1,74 +0,0 @@
---- html/config.php.orig	Tue Sep 27 21:03:12 2005
-+++ html/config.php	Fri Jan 21 05:03:28 2005
-@@ -28,18 +28,18 @@
- /**************************************************************************/
- // Check the adodb/drivers/ directory for support for your database
- // you may choose from many (mysql is the default)
--$cfg["db_type"] = "mysql";       // mysql, postgres7 view adodb/drivers/
--$cfg["db_host"] = "localhost";   // DB host computer name or IP
--$cfg["db_name"] = "torrentflux"; // Name of the Database
--$cfg["db_user"] = "user";        // username for your MySQL database
--$cfg["db_pass"] = "password";    // password for database
-+$cfg["db_type"] = "sqlite";                    // mysql, postgres7 view adodb/drivers/
-+$cfg["db_host"] = "%%DATABASE%%/tf.db"; // path to sqlite database
-+$cfg["db_name"] = "";                          // unused for sqlite
-+$cfg["db_user"] = "";                          // unused for sqlite
-+$cfg["db_pass"] = "";                          // unused for sqlite
- /**************************************************************************/
- 
- /**************************************************************************/
- // Define the PATH where the downloads will go (note that it ends with a / [slash])
- // Note this can be anywhere (not where TorrentFlux is installed)
--// must be chmod'd to 777 (DO NOT MAKE THIS THE PATH TO YOUR PHP FILES!)
--$cfg["path"] = "/usr/local/torrent/";
-+// must be chown'd to www (DO NOT MAKE THIS THE PATH TO YOUR PHP FILES!)
-+$cfg["path"] = "%%DOWNLOADS%%/";
- /**************************************************************************/
- 
- /**************************************************************************/
-@@ -47,13 +47,13 @@
- // Only change the path to this file as needed.
- // You may use 'btphptornado.py' for BitTornado Client or 'btphptorrent.py'
- // for the original BitTorrent Client (read the INSTALL file for more).
--$cfg["btphpbin"] = "/usr/local/TF_BitTornado/btphptornado.py";
-+$cfg["btphpbin"] = "%%PREFIX%%/libexec/btphptornado.py";
- /**************************************************************************/
- 
- /**************************************************************************/
- // Specify the btshowmetainfo.py file name
- // Use the full path to this file -- change as needed.
--$cfg["btshowmetainfo"] = "/usr/local/TF_BitTornado/btshowmetainfo.py";
-+$cfg["btshowmetainfo"] = "%%LOCALBASE%%/bin/btshowmetainfo.py";
- /**************************************************************************/
- 
- // Set advanced_start to true if you want to allow users to use the advanced
-@@ -84,6 +84,9 @@
- // Enable the Suprnova.org Search Form on Home Page
- $cfg["enable_search"] = true;
- 
-+// Calculate directory size in directory browsing
-+$cfg["show_directory_size"] = true;
-+
- // Enable users to download files from the directory browsing
- $cfg["enable_file_download"] = true;
- 
-@@ -93,9 +96,6 @@
- // Enable showing the average server load over the last 15 minutes from /proc/loadavg file
- $cfg["show_server_load"] = true;
- 
--// The path to your loadavg file
--$cfg["loadavg_path"] = "/proc/loadavg";
--
- // days to keep audit actions in DB. (owner ship of torrent based on this)
- $cfg['days_to_keep'] = 30;
- 
-@@ -160,6 +160,9 @@
- // DO NOT Edit below this line unless you know what you're doing.
- // ***************************************************************************
- // ***************************************************************************
-+
-+// Set a reasonable umask
-+umask(0022);
- 
- $cfg["pagetitle"] = "TorrentFlux";
- 
diff --git a/net-p2p/torrentflux/files/patch-html+db.php b/net-p2p/torrentflux/files/patch-html+db.php
deleted file mode 100644
index da8353d02812..000000000000
--- a/net-p2p/torrentflux/files/patch-html+db.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/db.php.orig	Wed Sep 28 01:52:53 2005
-+++ html/db.php	Wed Sep 28 01:54:51 2005
-@@ -2,7 +2,7 @@
- 
- // will need include of config.php
- include_once('config.php');
--include_once('adodb/adodb.inc.php');
-+include_once('%%LOCALBASE%%/share/adodb/adodb.inc.php');
- 
- function getdb()
- {
diff --git a/net-p2p/torrentflux/files/patch-html+dir.php b/net-p2p/torrentflux/files/patch-html+dir.php
deleted file mode 100644
index 52ffb7572ec3..000000000000
--- a/net-p2p/torrentflux/files/patch-html+dir.php
+++ /dev/null
@@ -1,76 +0,0 @@
---- html/dir.php.orig	Tue Oct  4 01:39:38 2005
-+++ html/dir.php	Tue Oct  4 01:51:36 2005
-@@ -104,15 +104,26 @@
- 		
- 		if (file_exists($path))
- 		{
-+			$fileSize = exec("stat -Lnqf %z ".escapeshellarg($path));
-+
-+			AuditAction($cfg["constants"]["fm_download"], $down."<br>Size:".$fileSize);
-+
- 			header("Content-type: application/octet-stream\n");
- 			header("Content-disposition: attachment; filename=\"".$file."\"\n");
- 			header("Content-transfer-encoding: binary\n");
--			header("Content-length: " . filesize($path) . "\n");
-+			header("Content-length: " . $fileSize . "\n");
-+
-+			while (ob_get_level() > 0) {
-+				ob_end_flush();
-+			}
- 			
- 			$fp = fopen($path, "r");
--			fpassthru($fp);
-+			while(!feof($fp)) {
-+				set_time_limit(60);
-+				print(fread($fp, 1024*8));
-+				ob_flush();
-+			}
- 		
--			AuditAction($cfg["constants"]["fm_download"], $down);
- 			exit();
- 		}
- 		else
-@@ -283,8 +294,19 @@
- 			if (@is_dir($dirName.$entry))
- 			{
- 				echo "<tr bgcolor=\"".$bg."\"><td><a href=\"dir.php?dir=".urlencode($dir.$entry)."\"><img src=\"images/folder2.gif\" width=\"16\" height=\"16\" title=\"".$entry."\" border=\"0\" align=\"absmiddle\">".$entry."</a></td>";
--				echo "<td>&nbsp;</td>";
--				echo "<td>&nbsp;</td>";
-+				if ($cfg["show_directory_size"])
-+				{
-+					$timeStamp = filectime($dirName.$entry);
-+					$arFileSize = explode("\t", exec("du -sk ".escapeshellarg($dirName.$entry)));
-+					$fileSize = $arFileSize[0];
-+					echo "<td align=\"right\">".$fileSize." KB</td>";
-+					echo "<td>".date("m-d-Y g:i a", $timeStamp)."</td>";
-+				} 
-+				else
-+				{ 
-+					echo "<td>&nbsp;</td>";
-+					echo "<td>&nbsp;</td>";
-+				} 
- 				echo "<td align=\"right\">";
- 				
- 				if ($cfg["enable_file_download"])
-@@ -340,9 +362,9 @@
- 			}
- 			else
- 			{
--				$arStat = @lstat($dirName.$entry);
--				$timeStamp = $arStat[10];
--				$fileSize = number_format(($arStat[7])/1024);
-+				$timeStamp = filectime($dirName.$entry);
-+				$arFileSize = explode("\t", exec("du -sk ".escapeshellarg($dirName.$entry)));
-+				$fileSize = $arFileSize[0];
- 				// Code added by Remko Jantzen to assign an icon per file-type. But when not
- 				// available all stays the same.
- 				$image="images/time.gif";
-@@ -423,7 +445,7 @@
- 	if (!is_dir($cfg["path"].$cfg["user"]))
- 	{
- 		//Then create it
--		mkdir($cfg["path"].$cfg["user"], 0777);
-+		mkdir($cfg["path"].$cfg["user"], 0755);
- 	}
- }
- 
diff --git a/net-p2p/torrentflux/files/patch-html+functions.php b/net-p2p/torrentflux/files/patch-html+functions.php
deleted file mode 100644
index f7ab843c89ad..000000000000
--- a/net-p2p/torrentflux/files/patch-html+functions.php
+++ /dev/null
@@ -1,76 +0,0 @@
---- html/functions.php.orig	Fri Oct  7 00:39:53 2005
-+++ html/functions.php	Fri Oct  7 00:41:16 2005
-@@ -49,9 +49,9 @@
- // avddelete()
- function avddelete($file)
- {
--	chmod($file,0777);
- 	if (@is_dir($file))
- 	{
-+		chmod($file,0755);
- 		$handle = @opendir($file);
- 		while($filename = readdir($handle))
- 		{
-@@ -65,6 +65,7 @@
- 	}
- 	else
- 	{
-+		chmod($file,0644);
- 		@unlink($file);
- 	}
- }
-@@ -872,7 +873,7 @@
- 	global $cfg;
- 	
- 	echo "<div align=\"right\">";
--	echo "<a href=\"http://www.torrentflux.com\" target=\"_blank\"><font class=\"tinywhite\">TorrentFlux ".$cfg["version"]."</font></a>&nbsp;&nbsp;";
-+	echo "<a href=\"http://www.torrentflux.com\" target=\"_blank\"><font class=\"tinywhite\">TorrentFlux %%PORTVERSION%%</font></a>&nbsp;&nbsp;";
- 	echo "</div>";
- }
- 
-@@ -1028,7 +1029,7 @@
- 	if (!is_dir($cfg["torrent_file_path"]))
- 	{
- 		//Then create it
--		mkdir($cfg["torrent_file_path"], 0777);
-+		mkdir($cfg["torrent_file_path"], 0755);
- 	}
- }
- 
-@@ -1152,7 +1153,7 @@
- // Remove bad characters that cause problems
- function cleanFileName($inName)
- {
--	$replaceItems = array("'", ",", "#", "%", "!", "+", ":", "/", "\\", "@", "$", "&", "?");
-+	$replaceItems = array("'", ",", "#", "%", "!", "+", ":", "/", "\\", "@", "$", "&", "?", "\"");
-     $cleanName = str_replace($replaceItems, "", $inName);
- 
- 	return $cleanName;
-@@ -1264,7 +1265,7 @@
- 	if (strpos($rtnValue, "d8:") === false)
- 	{
- 		// We don't have a Torrent File... it is something else
--		AuditAction($cfg["constants"]["error"], "BAD TORRENT for: ".$url."\n".$rtnValue);
-+		AuditAction($cfg["constants"]["error"], "BAD TORRENT for: ".$url."<br>".htmlspecialchars(substr($rtnValue, 0, 512)));
- 		$rtnValue = "";
- 	}
- 	return $rtnValue;
-@@ -1564,7 +1565,7 @@
- 			if($kill_id != "" && $af->percent_done >= 0 && $af->running == 1)
- 			{
- 				
--				$output .= "<a href=\"index.php?alias_file=".$alias."&kill=".$kill_id."&kill_torrent=".urlencode($entry)."\"><img src=\"images/kill.gif\" width=16 height=16 title=\""._STOPDOWNLOAD."\n"._USER.": ".$lastUser."\" border=0></a>";
-+				$output .= "<a href=\"index.php?alias_file=".$alias."&kill=".$kill_id."&kill_torrent=".urlencode($entry)."\"><img src=\"images/kill.gif\" width=16 height=16 title=\""._STOPDOWNLOAD." ("._USER.": ".$lastUser.")\" border=0></a>";
- 				$output .= "<img src=\"images/delete_off.gif\" width=16 height=16 border=0>";
- 				
- 			}
-@@ -1572,7 +1573,8 @@
- 			{
- 				if($torrentowner == "n/a")
- 				{
--					$output .= "<img src=\"images/run_off.gif\" width=16 height=16 border=0 title=\""._NOTOWNER."\">";
-+					$takelink = $_SERVER['PHP_SELF']."?alias_file=".$alias."&takefile=".urlencode($entry);
-+					$output .= "<a href=\"".$takelink."\"><img src=\"images/run_off.gif\" width=16 height=16 border=0 title=\""._NOTOWNER."\"></a>";
- 				}
- 				else
- 				{
diff --git a/net-p2p/torrentflux/files/patch-html+index.php b/net-p2p/torrentflux/files/patch-html+index.php
deleted file mode 100644
index 6c4082be37c0..000000000000
--- a/net-p2p/torrentflux/files/patch-html+index.php
+++ /dev/null
@@ -1,69 +0,0 @@
---- html/index.php.orig	Mon Oct 10 00:08:03 2005
-+++ html/index.php	Mon Oct 10 00:08:54 2005
-@@ -33,11 +33,11 @@
- {
- 	include_once("AliasFile.php");
- 	$command = "";
--	If (empty($rate))
-+	If (!isset($rate))
- 	{
- 		$rate = $cfg["max_upload_rate"];
- 	}
--	if (empty($drate)) {
-+	if (!isset($drate)) {
- 		$drate = $cfg["max_download_rate"];
- 	}
- 	if (empty($superseeder)) {
-@@ -97,6 +97,7 @@
- 	//AuditAction($cfg["constants"]["start_torrent"], $torrent);
- 	AuditAction($cfg["constants"]["start_torrent"], $torrent."<br>Die:".$runtime.", Sharekill:".$sharekill.", MaxUploads:".$maxuploads.", DownRate:".$drate.", UploadRate:".$rate.", Ports:".$minport."-".$maxport.", SuperSeed:".$superseeder);
- 
-+	sleep(2); // wait 2 seconds
- 	header("location: index.php");
- }
- 
-@@ -192,7 +193,7 @@
- 			{
- 				if(move_uploaded_file($_FILES['upload_file']['tmp_name'], $cfg["torrent_file_path"].$file_name))
- 				{
--					chmod($cfg["torrent_file_path"].$file_name, 0644);
-+					chmod($cfg["torrent_file_path"].$file_name, 0640);
- 				
- 					AuditAction($cfg["constants"]["file_upload"], $file_name);
- 				
-@@ -221,6 +222,21 @@
- 	}
- }  // End File Upload
- 
-+// adopt abandoned torrents
-+if(isset($takefile))
-+{
-+	if (("n/a" == getOwner($delfile)) && IsAdmin())
-+	{
-+		AuditAction($cfg["constants"]["file_upload"], $takefile);
-+
-+		header("location: index.php");
-+	}
-+	else
-+	{
-+		AuditAction($cfg["constants"]["error"], $cfg["user"]." attempted to take ".$takefile);
-+	}
-+}
-+
- 
- // if a file was set to be deleted then delete it
- if(isset($delfile))
-@@ -565,10 +581,10 @@
- 	Total Download: <strong><?php echo number_format($cfg["total_download"], 2); ?></strong> kB/s<br>
- 	Free Space: <strong><?php echo formatFreeSpace($cfg["free_space"]) ?></strong>
- <?php 
--	if ($cfg["show_server_load"] && is_file($cfg["loadavg_path"]))
-+	if ($cfg["show_server_load"])
- 	{
--		$loadavg_array = explode(" ", exec("cat ".$cfg["loadavg_path"]));
--		$loadavg = $loadavg_array[2];
-+		$loadavg_array = explode(" ", exec("sysctl -n vm.loadavg"));
-+		$loadavg = $loadavg_array[3];
- 		echo "<br>Server Load: <strong>".$loadavg."</strong>";
- 	}
- ?>
diff --git a/net-p2p/torrentflux/files/patch-html+startpop.php b/net-p2p/torrentflux/files/patch-html+startpop.php
deleted file mode 100644
index f510858d6228..000000000000
--- a/net-p2p/torrentflux/files/patch-html+startpop.php
+++ /dev/null
@@ -1,20 +0,0 @@
---- html/startpop.php.orig	Mon Oct 10 16:41:17 2005
-+++ html/startpop.php	Mon Oct 10 16:42:20 2005
-@@ -138,7 +138,7 @@
- 
- function isNumber(sText)
- {
--	var ValidChars = "0123456789.";
-+	var ValidChars = "0123456789.-";
- 	var IsNumber = true;
- 	var Char;
- 
-@@ -168,7 +168,7 @@
- 		<table width="100%" cellpadding="3" cellspacing="0" border="0">
- 		<tr>
- 			<td align="right">Max Upload Rate:</td>
--			<td><input type="Text" name="maxRate" maxlength="4" size="4" value="<?php echo $cfg["max_upload_rate"]; ?>"> kB/s</td>
-+			<td><input type="Text" name="maxRate" maxlength="4" size="4" value="<?php echo $cfg["max_upload_rate"]; ?>"> kB/s<font class="tiny"> (-1 = auto)</font></td>
- 			<td align="right">Max # Uploads:</td>
- 			<td><input type="Text" name="maxUploads" maxlength="2" size="2" value="<?php echo $cfg["max_uploads"]; ?>"></td>
- 		</tr>
diff --git a/net-p2p/torrentflux/files/patch-html+torrentspy.php b/net-p2p/torrentflux/files/patch-html+torrentspy.php
deleted file mode 100644
index 5d7a8f06cbc3..000000000000
--- a/net-p2p/torrentflux/files/patch-html+torrentspy.php
+++ /dev/null
@@ -1,322 +0,0 @@
---- html/torrentspy.php	Sat Oct 15 11:48:01 2005
-+++ html/torrentspy.php	Sat Oct 15 12:01:29 2005
-@@ -22,12 +22,13 @@
-     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
- 
--// Original code posted by heddock in the TorrentFlux forums, modified by Qrome
-+// Original code posted by heddock in the TorrentFlux forums, modified by Qrome and Kboy
- 
- include_once("config.php");
- include_once("functions.php");
- 
- $msg = "";
-+$thing = "";
- 
- // Try to connect
- if (!$fp = @fsockopen ("www.torrentspy.com", 80, $errno, $errstr, 30))
-@@ -42,11 +43,15 @@
- 	
- 	// break the search terms up so they can be handled by the search engine
- 	$searchterm=str_replace(" ", "+",$_REQUEST["spysearch"]);
-+	if (empty($searchterm))
-+	{
-+		$searchterm = $_REQUEST["query"];
-+	}
- 	
- 	
--	if ($_REQUEST["genre"] != "")
-+	if ($_REQUEST["mainGenre"] != "")
- 	{
--		$request = 'GET /directory.asp?mode=sub&id='. $_REQUEST["genre"] . ' HTTP/1.1' ."\r\n".
-+		$request = 'GET /directory.asp?mode=main&id='. $_REQUEST["mainGenre"] . ' HTTP/1.1' ."\r\n".
- 		           'Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' ."\r\n".
- 		           'Referer: http://www.torrentspy.com/latest.asp' ."\r\n".
- 		           'Accept-Language: en-us' ."\r\n".
-@@ -57,11 +62,11 @@
- 	}
- 	else
- 	{
--		if ($_REQUEST["LATEST"] != 1)
-+		if ($_REQUEST["subGenre"] != "")
- 		{
--			$request = 'GET /search.asp?query='. $searchterm . '&submit.x=24&submit.y=10 HTTP/1.1' ."\r\n".
-+			$request = 'GET /directory.asp?mode=sub&id='. $_REQUEST["subGenre"] . ' HTTP/1.1' ."\r\n".
- 		           'Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' ."\r\n".
--		           'Referer: http://www.torrentspy.com/' ."\r\n".
-+					   'Referer: http://www.torrentspy.com/latest.asp' ."\r\n".
- 		           'Accept-Language: en-us' ."\r\n".
- 		           'User-Agent: '.$_SERVER['HTTP_USER_AGENT'] ."\r\n".
- 		           'Host: www.torrentspy.com' ."\r\n".
-@@ -70,7 +75,32 @@
- 		}
- 		else
- 		{
--			$request = 'GET /latest.asp HTTP/1.1' ."\r\n".
-+			switch ($_REQUEST["LATEST"])
-+			{
-+				case "1":
-+					$request = 'GET /latest.asp?pg='.$_REQUEST["pg"].' HTTP/1.1' ."\r\n".
-+					   'Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' ."\r\n".
-+					   'Referer: http://www.torrentspy.com/' ."\r\n".
-+					   'Accept-Language: en-us' ."\r\n".
-+					   'User-Agent: '.$_SERVER['HTTP_USER_AGENT'] ."\r\n".
-+					   'Host: www.torrentspy.com' ."\r\n".
-+					   'Connection: Close' ."\r\n".
-+					   'Cookie: ' ."\r\n\r\n";
-+				break;
-+				
-+				case "-1":
-+					$request = 'GET /directory.asp?mode='.$_REQUEST["mode"].'&id='.$_REQUEST["id"].'&pg='.$_REQUEST["pg"].'&submit.x=24&submit.y=10 HTTP/1.1' ."\r\n".
-+					   'Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' ."\r\n".
-+					   'Referer: http://www.torrentspy.com/' ."\r\n".
-+					   'Accept-Language: en-us' ."\r\n".
-+					   'User-Agent: '.$_SERVER['HTTP_USER_AGENT'] ."\r\n".
-+					   'Host: www.torrentspy.com' ."\r\n".
-+					   'Connection: Close' ."\r\n".
-+					   'Cookie: ' ."\r\n\r\n";
-+				break;
-+				
-+				default:
-+					$request = 'GET /search.asp?query='. $searchterm .'&pg='.$_REQUEST["pg"].'&db='.$_REQUEST["db"].'&submit.x=24&submit.y=10 HTTP/1.1' ."\r\n".
- 		           'Accept: image/gif, image/x-xbitmap, image/jpeg, image/pjpeg, application/x-shockwave-flash, application/vnd.ms-excel, application/vnd.ms-powerpoint, application/msword, */*' ."\r\n".
- 		           'Referer: http://www.torrentspy.com/' ."\r\n".
- 		           'Accept-Language: en-us' ."\r\n".
-@@ -78,6 +108,8 @@
- 		           'Host: www.torrentspy.com' ."\r\n".
- 		           'Connection: Close' ."\r\n".
- 		           'Cookie: ' ."\r\n\r\n";
-+				break;
-+			}
- 		}
- 	}
- 	
-@@ -92,9 +124,9 @@
- 	}
- 	fclose($fp);
- 	
--	$thing = substr($thing,strpos($thing,"\r\n\r\n")+4);
-+	//$thing = substr($thing,strpos($thing,"\r\n\r\n")+4);
- 	
--	$thing = substr($thing,strpos($thing,"Torrent Name")+12);
-+	//$thing = substr($thing,strpos($thing,"Torrent Name")+12);
- }
- 
- DisplayHead("TorrentSpy "._SEARCH);
-@@ -105,9 +137,21 @@
- echo "<td bgcolor=\"".$cfg["table_header_bg"]."\">";
- echo "<form name=\"form_url\" action=\"torrentspy.php\" method=\"post\">";
- echo _SEARCH." TorrentSpy:<br>";
--echo "<input type=\"text\" name=\"spysearch\" value=\"".$_REQUEST["spysearch"]."\" size=30  maxlength=50>&nbsp;";
-+echo "<input type=\"text\" name=\"spysearch\" value=\"".$searchterm."\" size=30  maxlength=50>&nbsp;";
- echo "<input type=\"Submit\" value=\""._SEARCH."\">&nbsp;&nbsp;<a href=\"torrentspy.php?LATEST=1\"><img src=\"images/properties.png\" width=18 height=13 title=\"Show Latest Torrents\" align=\"absmiddle\" border=0>Show Latest Torrents</a>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Visit: <a href=\"http://www.torrentspy.com/\" target=\"_blank\">TorrentSpy.com</a><br><br>";
--echo "* Click on Torrent Links to add them to the Torrent Download List";
-+echo "* Click on Torrent Links to add them to the Torrent Download List<br><br>";
-+echo "<div align=center>";
-+echo "<a href=\"torrentspy.php?mainGenre=2\">Games</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=4\">Movies</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=5\">TV</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=3\">Music</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=1\">Applications</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=6\">Anime</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=8\">Linux</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=9\">Macintosh</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=10\">Misc</a> | ";
-+echo "<a href=\"torrentspy.php?mainGenre=12\">Unsorted/Other</a>";
-+echo "</div>";
- echo "</td></tr></form></table>";
- echo "</div>";
- 
-@@ -120,6 +164,28 @@
- }
- else
- {
-+	if ($_REQUEST["mainGenre"] != "")
-+	{
-+		echo "<br>";
-+		echo "<tr bgcolor=\"".$cfg["table_header_bg"]."\">";
-+		echo "<td colspan=6><form method=get action=torrentspy.php?>";
-+		$thing = substr($thing,strpos($thing,"Torrent Directory:")+strlen("Torrent Directory:"));
-+		echo "Category: <b>".substr($thing,0,strpos($thing,"<"))."</a></b> -> ";
-+		echo "<select name=subGenre>";
-+		while (is_integer(strpos($thing,"directory.asp?mode=sub&id=")))
-+		{
-+			$thing = substr($thing,strpos($thing,"directory.asp?mode=sub&id=")+strlen("directory.asp?mode=sub&id="));
-+			$subid = substr($thing,0,strpos($thing,"&"));
-+			$thing = substr($thing,strpos($thing,"&cat=")+strlen("&cat="));
-+			$subname = substr($thing,0,strpos($thing,"\""));
-+			echo "<option value=".$subid.">".$subname."</option>";
-+		}
-+		echo "</select> ";
-+		echo "<input type=submit value='Show Latest'>";
-+		echo "</form>";
-+	}
-+	else
-+	{
- 	echo "<br>";
- 	echo "<tr bgcolor=\"".$cfg["table_header_bg"]."\">";
- 	echo "	<td>&nbsp;</td>";
-@@ -130,13 +196,11 @@
- 	echo "	<td><strong>Peers</strong></td>";
- 	echo "</tr>";
- 	// We got a response so display it.
--	while (is_integer(strpos($thing,"<tr bgcolor")))
-+		while (is_integer(strpos($thing,"download.asp?id=")))
- 	{
--		$thing = substr($thing,strpos($thing,"<tr bgcolor")+3);
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
--		$thing = substr($thing,strpos($thing,"href=")+6);
-+			$thing = substr($thing,strpos($thing,"download.asp?id=")+strlen("download.asp?id="));
- 		$link = substr($thing,0,strpos($thing,"\""));
--		$link = "http://www.torrentspy.com/" . $link;
-+			$link = "http://www.torrentspy.com/download.asp?id=" . $link;
- 		
- 		$thing = substr($thing,strpos($thing,"title=")+7);
- 		$thing = substr($thing,strpos($thing,"title=")+7);
-@@ -148,29 +212,65 @@
- 			$displayname .= "...";
- 		}
- 		
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
-+			$thing = substr($thing,strpos($thing,"directory.asp?mode=")+strlen("directory.asp?mode="));
-+			$modeType = substr($thing,0,strpos($thing,"&"));
-+
-+
-+			// Empty out vars
-+			$mainid = "";
-+			$subid = "";
-+			$mainGenre = "";
-+			$subGenre = "";
-+
-+			if ( $modeType == "main" )
-+			{
- 		$thing = substr($thing,strpos($thing,"id=")+3);
--		$gid = substr($thing,0,strpos($thing,"\""));
-+				$mainid = substr($thing,0,strpos($thing,"\""));
- 		
- 		$thing = substr($thing,strpos($thing,">")+1);
--		$genre = substr($thing,0,strpos($thing,"<"));
-+				$mainGenre = substr($thing,0,strpos($thing,"<"));
-+
-+				$thing = substr($thing,strpos($thing,"id=")+3);
-+				$subid = substr($thing,0,strpos($thing,"\""));
- 		
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
- 		$thing = substr($thing,strpos($thing,">")+1);
--		$size = substr($thing,0,strpos($thing,"<"));
-+				$subGenre = substr($thing,0,strpos($thing,"<"));
-+
-+			}
-+			else
-+			{
-+				$thing = substr($thing,strpos($thing,"id=")+3);
-+				$subid = substr($thing,0,strpos($thing,"\""));
- 		
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
- 		$thing = substr($thing,strpos($thing,">")+1);
-+				$subGenre = substr($thing,0,strpos($thing,"<"));
-+			}
-+
-+
-+			$thing = substr($thing,strpos($thing,"<td nowrap>")+11);
-+			$size = substr($thing,0,strpos($thing,"<"));
-+
-+
-+			$thing = substr($thing,strpos($thing,"<td nowrap>")+11);
- 		$files = substr($thing,0,strpos($thing,"<"));
- 		
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
--		$thing = substr($thing,strpos($thing,">")+1);
-+
-+			$thing = substr($thing,strpos($thing,"<td nowrap>")+11);
- 		$seeds = substr($thing,0,strpos($thing,"<"));
- 		
--		$thing = substr($thing,strpos($thing,"<td width=")+10);
--		$thing = substr($thing,strpos($thing,">")+1);
-+			if ($seeds == "")
-+			{
-+				$seeds = "NA";
-+			}
-+
-+			$thing = substr($thing,strpos($thing,"<td nowrap>")+11);
- 		$peers = substr($thing,0,strpos($thing,"<"));
-+			if ($peers == "")
-+			{
-+				$peers = "NA";
-+			}
- 	 
-+			// See what the bg color is and switch it
- 		if ($bg == $cfg["bgLight"])
- 		{
- 			$bg = $cfg["bgDark"];
-@@ -181,17 +281,68 @@
- 		}
- 		 
- 		
-+			// Ok hide the rows that don't have seed info
-+			//if ($seeds != "NA" )
-+			//{
- 		echo "<tr>";
--		echo "	<td width=16 bgcolor=\"".$bg."\"><a href=\"index.php?url_upload=".$link."\"><img src=\"images/download_owner.gif\" width=\"16\" height=\"16\" title=\"".$title."\" border=0></a></td>";
-+				echo "	<td width=16 bgcolor=\"".$bg."\"><a href=\"index.php?url_upload=".$link."\"><img src=\"images/download_owner.gif\" width=\"16\" height=\"16\" title=\"".$title." - ".$files." "._FILE."\" border=0></a></td>";
- 		echo "	<td bgcolor=\"".$bg."\"><a href=\"index.php?url_upload=".$link."\" title=\"".$title."\">".$displayname."</a></td>";
--		echo "	<td bgcolor=\"".$bg."\"><a href=\"torrentspy.php?genre=".$gid."\">". $genre ."</a></td>";
-+
-+				if (strlen($mainGenre) > 1)
-+				{
-+					if (strlen($subGenre) > 1)
-+					{
-+						$mainGenre = "<a href=\"torrentspy.php?mainGenre=".$mainid."\">". $mainGenre ."</a>";
-+						$subGenre = "<a href=\"torrentspy.php?subGenre=".$subid."\">". $subGenre ."</a>";
-+						$genre = $mainGenre."-".$subGenre;
-+					}
-+					else
-+					{
-+						$genre = "<a href=\"torrentspy.php?mainGenre=".$mainid."\">". $mainGenre ."</a>";
-+					}
-+				}
-+				else
-+				{
-+						$genre = "<a href=\"torrentspy.php?subGenre=".$subid."\">". $subGenre ."</a>";
-+				}
-+
-+				echo "	<td bgcolor=\"".$bg."\">". $genre ."</td>";
-+
-+				//echo "	<td bgcolor=\"".$bg."\"><a href=\"torrentspy.php?genre=".$gid."\">". $genre ."</a></td>";
-+
- 		echo "	<td bgcolor=\"".$bg."\" align=right>".$size."</td>";
- 		echo "	<td bgcolor=\"".$bg."\" align=center>". $seeds."</td>";
- 		echo "	<td bgcolor=\"".$bg."\" align=center>". $peers."</td>";
- 		echo "</tr>";
-+			//}
-+		}
- 	}
- }
- echo "</table>";
-+
-+// is there paging at the bottom?
-+if (strpos($thing, "<p class=\"pagenav\">Pages (") !== false)
-+{
-+	// Yes, then lets grab it and display it!  ;)
-+	$thing = substr($thing,strpos($thing,"<p class=\"pagenav\">Pages (")+strlen("<p class=\"pagenav\">"));
-+	$pages = substr($thing,0,strpos($thing,"</p>"));
-+	$pages = str_replace("<img src=\"gfx/icons/pages.gif\" width=\"10\" height\"12\"> ", "", $pages);
-+	if (strpos($pages, "search.asp?"))
-+	{
-+		$pages = str_replace("search.asp?", "torrentspy.php?LATEST=0&", $pages);
-+	}
-+	if (strpos($pages, "directory.asp?"))
-+	{
-+		//http://qrome/torrent/directory.asp?mode=sub&id=12&pg=3
-+		$pages = str_replace("directory.asp?", "torrentspy.php?LATEST=-1&", $pages);
-+	}
-+	if (strpos($pages, "latest.asp?"))
-+	{
-+		$pages = str_replace("latest.asp?", "torrentspy.php?LATEST=1&", $pages);
-+	}
-+	
-+	echo "<br><div align=center>".$pages."</div><br>";
-+}
- 
- DisplayFoot();
- ?>
diff --git a/net-p2p/torrentflux/files/patch-html+who.php b/net-p2p/torrentflux/files/patch-html+who.php
deleted file mode 100644
index 960ab19792c3..000000000000
--- a/net-p2p/torrentflux/files/patch-html+who.php
+++ /dev/null
@@ -1,11 +0,0 @@
---- html/who.php.orig	Wed Sep 28 19:33:51 2005
-+++ html/who.php	Wed Sep 28 19:34:34 2005
-@@ -27,7 +27,7 @@
- 
- 
- $result = shell_exec("w");
--$result2 = shell_exec("free -mo");
-+$result2 = shell_exec("pstat -T");
- 
- 
- DisplayHead(_SERVERSTATS);
diff --git a/net-p2p/torrentflux/files/pkg-deinstall.in b/net-p2p/torrentflux/files/pkg-deinstall.in
deleted file mode 100644
index 25095b758f14..000000000000
--- a/net-p2p/torrentflux/files/pkg-deinstall.in
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh -e
-#
-# $FreeBSD$
-#
-
-CAT=/bin/cat
-ECHO_CMD=echo
-MD5=/sbin/md5
-RM=/bin/rm
-RMDIR=/bin/rmdir
-TRUE=/usr/bin/true
-
-case $2 in
-DEINSTALL)
-  if [ -r "%%DATABASE%%/tf.md5" ]; then
-    saved=`${CAT} "%%DATABASE%%/tf.md5"`
-    calc=`${MD5} -q "%%DATABASE%%/tf.db"`
-    if [ "x$saved" = "x$calc" ]; then
-      ${RM} -Rf "%%DATABASE%%"
-      ${ECHO_CMD}
-      ${ECHO_CMD} "===>  Deleted TorrentFlux database."
-      ${ECHO_CMD}
-    else
-      ${RM} -f "%%DATABASE%%/tf.md5"
-    fi
-  fi
-  ${RMDIR} "%%DOWNLOADS%%" 2>/dev/null || ${TRUE}
-  ;;
-esac
diff --git a/net-p2p/torrentflux/files/pkg-install.in b/net-p2p/torrentflux/files/pkg-install.in
deleted file mode 100644
index dce2f1bdd266..000000000000
--- a/net-p2p/torrentflux/files/pkg-install.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-CHMOD=/bin/chmod
-CHOWN=/usr/sbin/chown
-ECHO_CMD=echo
-GREP=/usr/bin/grep
-MD5=/sbin/md5
-MKDIR=/bin/mkdir
-PW=/usr/sbin/pw
-SH=/bin/sh
-SU=/usr/bin/su
-SQLITE=%%LOCALBASE%%/bin/sqlite
-
-FTPUSERS=/etc/ftpusers
-
-case $2 in
-POST-INSTALL)
-  if ! ${PW} usershow -n www >/dev/null 2>&1; then
-    ${ECHO_CMD}
-    if ! ${PW} groupshow -n www >/dev/null 2>&1; then
-      if ! ${PW} groupadd -n www -g 80; then
-        ${ECHO_CMD} "*** Failed to add a group 'www' with id 80."
-        ${ECHO_CMD}
-        ${ECHO_CMD} "Please add the 'www' user manually with"
-        ${ECHO_CMD} "  ${PW} useradd -n www -g www -c 'World Wide Web Owner' \\"
-        ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-        ${ECHO_CMD} "and retry installing this package."
-        exit 1
-      fi
-      ${ECHO_CMD} "===>  Group 'www' created."
-    fi
-    if ! ${PW} useradd -n www -u 80 -g www -c 'World Wide Web Owner' \
-        -d /nonexistent -s /sbin/nologin -h -; then
-      ${ECHO_CMD} "*** Failed to add an user 'www' with id 80."
-      ${ECHO_CMD}
-      ${ECHO_CMD} "Please add the 'www' user manually with"
-      ${ECHO_CMD} "  ${PW} useradd -n www -g www -c 'World Wide Web Owner' \\"
-      ${ECHO_CMD} "  -d /nonexistent -s /sbin/nologin -h -"        
-      ${ECHO_CMD} "and retry installing this package."
-      exit 1
-    fi
-    ${GREP} -qs '^www$' ${FTPUSERS} || ${ECHO_CMD} www >> ${FTPUSERS}
-    ${ECHO_CMD} "===>  Account 'www' created."
-  fi
-
-  if [ ! -d "%%DOWNLOADS%%" ]; then
-    if ! ${MKDIR} -p -m 755 "%%DOWNLOADS%%"; then
-      ${ECHO_CMD} "*** Failed to create download directory '%%DOWNLOADS%%'."
-      exit 1
-    fi
-    ${CHOWN} www:www "%%DOWNLOADS%%"
-    ${ECHO_CMD} "===>  Download directory created."
-  fi
-
-  if [ ! -d "%%DATABASE%%" ]; then
-    if ! ${MKDIR} -p -m 700 "%%DATABASE%%"; then
-      ${ECHO_CMD} "*** Failed to create database directory '%%DATABASE%%'."
-      exit 1
-    fi
-    ${CHOWN} www:www "%%DATABASE%%"
-  fi
-
-  if [ ! -f "%%DATABASE%%/tf.db" ]; then
-    if ! ${SQLITE} "%%DATABASE%%/tf.db" < "%%DATADIR%%/torrentflux.sqlite"; then
-      ${ECHO_CMD} "*** Failed to create SQLite database '%%DATABASE%%/tf.db'."
-    else
-      ${CHMOD} 600 "%%DATABASE%%/tf.db"
-      ${MD5} -q "%%DATABASE%%/tf.db" > "%%DATABASE%%/tf.md5"
-      ${CHOWN} www:www "%%DATABASE%%/tf.db" "%%DATABASE%%/tf.md5"
-      ${ECHO_CMD} "===>  Torrentflux database created."
-    fi
-  fi
-
-  ${SH} -e ${PKG_PREFIX}/etc/rc.d/torrentflux.sh start
-  ;;
-esac
diff --git a/net-p2p/torrentflux/files/pkg-message.in b/net-p2p/torrentflux/files/pkg-message.in
deleted file mode 100644
index c6da06d0b7a0..000000000000
--- a/net-p2p/torrentflux/files/pkg-message.in
+++ /dev/null
@@ -1,15 +0,0 @@
-
-************************************************************
-
-The TorrentFlux package has been successfully installed.
-
-Files will be downloaded to %%DOWNLOADS%%,
-to check how much space is left on the partition, try
-  df -H %%DOWNLOADS%%
-
-Visit the TorrentFlux forum at
-  http://www.torrentflux.com/forum/
-for more information.
-  
-************************************************************
-
diff --git a/net-p2p/torrentflux/files/torrentflux.sh.in b/net-p2p/torrentflux/files/torrentflux.sh.in
deleted file mode 100644
index 8582bdc0cb1f..000000000000
--- a/net-p2p/torrentflux/files/torrentflux.sh.in
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/sh -e
-#
-# $FreeBSD$
-#
-
-tf_ps_arg_cache_min=1024
-
-case "$1" in
-start)
-  ps_arg_cache_limit=`sysctl -n kern.ps_arg_cache_limit 2>/dev/null` || true
-  if [ -n "$ps_arg_cache_limit" -a "$ps_arg_cache_limit" -lt "$tf_ps_arg_cache_min" ]; then
-    echo -n '===>  '; 
-    sysctl kern.ps_arg_cache_limit="$tf_ps_arg_cache_min"
-  fi
-  ;;
-stop)
-  # download_base=`sed -nEe 's/^\\$cfg\\["path"\\][ 	]*=[ 	]*"(\\/[^"]+)".*$/\\1/p' \
-  #   %%PREFIX%%/etc/tfconfig.php`
-  pid_list=`ps xww -o pid,command -U www | \
-    awk '$3 ~ /btphptornado/ { \
-      if ($6 ~ "^%%DOWNLOADS%%/\\.torrents/[^/]+\\.stat$") { \
-        system ("echo -n 0 | dd bs=1 count=1 conv=notrunc of=\""$6"\" 2>/dev/null"); \
-        print $1 \
-      } \
-    }'`
-  # wait display_interval for btphptornado to catch up
-  if [ -n "$pid_list" ]; then
-    echo "Waiting for PIDS: "$pid_list"."
-    sleep 5
-  fi
-  # let init(8) kill the remaining processes
-  ;;
-status)
-  pid_list=`ps xww -o pid,command -U www | \
-    awk '$3 ~ /btphptornado/ { print $1 }'`
-  if [ -n "$pid_list" ]; then
-    echo "Torrents are active at pids "$pid_list"."
-  else
-    echo "No active torrents found."
-  fi
-  ;;
-*)
-  echo 1>&2 "Usage: $0 (start|stop|status)"
-  exit 1
-  ;;
-esac
diff --git a/net-p2p/torrentflux/files/torrentflux.sqlite b/net-p2p/torrentflux/files/torrentflux.sqlite
deleted file mode 100644
index b7a85f1b8460..000000000000
--- a/net-p2p/torrentflux/files/torrentflux.sqlite
+++ /dev/null
@@ -1,73 +0,0 @@
---
--- $FreeBSD$
---
--- Run this as the torrentflux user.
---
--- Example:
--- su -m www -c 'sqlite /path/to/torrentflux/.database/tf.db < torrentflux.sqlite'
---
-
-BEGIN TRANSACTION;
-
-CREATE TABLE tf_links (
-  lid INTEGER auto_increment,
-  url varchar(255) NOT NULL default '',
-  PRIMARY KEY  (lid)
-);
-
-INSERT INTO tf_links VALUES(1,'http://www.freebsd.org');
-INSERT INTO tf_links VALUES(2,'http://www.torrentflux.com');
-INSERT INTO tf_links VALUES(3,'http://isohunt.com');
-INSERT INTO tf_links VALUES(4,'http://torrentspy.com/');
-INSERT INTO tf_links VALUES(5,'http://www.mininova.org/');
-INSERT INTO tf_links VALUES(6,'http://thepiratebay.org/');
-INSERT INTO tf_links VALUES(7,'http://www.torrentbox.com/');
-INSERT INTO tf_links VALUES(8,'http://www.torrentreactor.to/index.php');
-INSERT INTO tf_links VALUES(9,'http://torrent.freesbie.org');
-INSERT INTO tf_links VALUES(10,'http://bittorrent.mozilla.org/');
-
-CREATE TABLE tf_log (
-  cid INTEGER auto_increment,
-  user_id varchar(32) NOT NULL default '',
-  file varchar(200) NOT NULL default '',
-  action varchar(200) NOT NULL default '',
-  ip varchar(15) NOT NULL default '',
-  ip_resolved varchar(200) NOT NULL default '',
-  user_agent varchar(200) NOT NULL default '',
-  time varchar(14) NOT NULL default '0',
-  PRIMARY KEY  (cid)
-);
-
-CREATE TABLE tf_messages (
-  mid INTEGER auto_increment,
-  to_user varchar(32) NOT NULL default '',
-  from_user varchar(32) NOT NULL default '',
-  message text,
-  IsNew int(11) default NULL,
-  ip varchar(15) NOT NULL default '',
-  time varchar(14) NOT NULL default '0',
-  force_read tinyint(1) default '0',
-  PRIMARY KEY  (mid)
-);
-
-CREATE TABLE tf_rss (
-  rid INTEGER auto_increment,
-  url varchar(255) NOT NULL default '',
-  PRIMARY KEY  (rid)
-);
-
-CREATE TABLE tf_users (
-  uid INTEGER auto_increment,
-  user_id varchar(32) NOT NULL default '',
-  password varchar(34) NOT NULL default '',
-  hits int(10) NOT NULL default '0',
-  last_visit varchar(14) NOT NULL default '0',
-  time_created varchar(14) NOT NULL default '0',
-  user_level tinyint(1) NOT NULL default '0',
-  hide_offline tinyint(1) NOT NULL default '0',
-  theme varchar(100) NOT NULL default 'mint',
-  language_file varchar(60) default 'lang-english.php',
-  PRIMARY KEY  (uid)
-);
-
-COMMIT;
diff --git a/net-p2p/torrentflux/pkg-descr b/net-p2p/torrentflux/pkg-descr
deleted file mode 100644
index 1bb27da4b0aa..000000000000
--- a/net-p2p/torrentflux/pkg-descr
+++ /dev/null
@@ -1,16 +0,0 @@
-TorrentFlux is a free PHP based BitTorrent client that runs on a web server.
-Manage all of your Torrent downloads through a convenient web interface from
-anywhere.
-
-TorrentFlux is a feature rich Torrent client. Users can manage Torrent downloads
-through a Web interface from anywhere. Torrents can be uploaded via a URL or
-file upload, and can be started, stopped, and deleted with a click. You are also
-able to view the download progress of all Torrents, server drive space, and
-Torrent file meta information before and during download. It has built-in user
-management and security as well as private messaging between users. Each user is
-able to select their own theme and view the upload history. For administrators
-there is a detailed user administration and searchable logs. Various languages
-are supported.
-
-
-WWW: http://www.torrentflux.com/
diff --git a/net-p2p/torrentflux/pkg-plist b/net-p2p/torrentflux/pkg-plist
deleted file mode 100644
index 633904dee2fc..000000000000
--- a/net-p2p/torrentflux/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-@comment $FreeBSD$
-@unexec if cmp -s %D/etc/tfconfig.php %D/etc/tfconfig.php.default; then rm -f %D/etc/tfconfig.php; fi
-etc/tfconfig.php.default
-@exec [ -f %B/tfconfig.php ] || cp %B/%f %B/tfconfig.php
-etc/rc.d/torrentflux.sh
-libexec/btphptornado.py
-%%DATADIR%%/torrentflux.sqlite
-@dirrmtry %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/install.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%