--- a/plugins/PunBB.php	Sun Sep 02 11:00:57 2007 -0400
+++ b/plugins/PunBB.php	Sat Apr 05 23:56:45 2008 -0400
@@ -4,15 +4,15 @@
 Plugin URI: http://enanocms.org/PunBB_plugin
 Description: Provides a complete forum solution in PunBB, a separately maintained and very lightweight GPL forum.
 Author: Dan Fuhry
-Version: 0.1.12.15
+Version: 1.3-beta
 Author URI: http://enanocms.org/
 */
 
 /*
  * PunBB Plugin for Enano CMS
- * Version 0.1.12.15
- * Copyright (C) 2006-2007 Dan Fuhry
- * Copyright (C) 2002-2007 Rickard Andersson
+ * Version 1.3-beta
+ * Copyright (C) 2006-2008 Dan Fuhry
+ * Copyright (C) 2002-2008 Rickard Andersson
  *
  * This program is Free Software; you can redistribute 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.
@@ -36,17 +36,19 @@
 $plugins->attachHook('session_started', '
     $pid = RenderMan::strToPageId($paths->get_pageid_from_url());
 
-    if ( getConfig("punbb_installed") == "yes" && getConfig("punbb_version") == PUNANO_VERSION && $pid[0] == "Forum" && $pid[1] == "Special" )
+    $is_style_or_script = ( strpos($_SERVER["REQUEST_URI"], "/style/") || strpos($_SERVER["REQUEST_URI"], "/include/js/") );
+    if ( getConfig("punbb_installed") == "yes" && getConfig("punbb_version") == PUNANO_VERSION && $pid[0] == "Forum" && $pid[1] == "Special" && !$is_style_or_script )
     {
       require( "punbb/include/common.php" );
     }
     ');
 
-define('PUNANO_VERSION', '0.1.12.15');
-define('PUNBB_VERSION',  '1.2.15');
+define('PUNANO_VERSION', '0.1.3-beta');
+define('PUNBB_VERSION',  '1.3-beta');
 define('PUN_ROOT', ENANO_ROOT . '/punbb/');
 define('PUN', '');
 define('PUN_DISABLE_BUFFERING', '');
+// define('PUN_SHOW_QUERIES', '');
 
 function page_Special_Forum()
 {
@@ -59,10 +61,22 @@
   {
     punano_upgrade();
   }
-  else if ( preg_match('/^admin_/i', $paths->getParam(0)) )
+  else if ( $paths->getParam(0) == 'admin' )
   {
     punano_admin_console();
   }
+  else if ( $paths->getParam(0) == 'style' )
+  {
+    $path = $paths->getAllParams();
+    header('Location: ' . scriptPath . '/punbb/' . $path);
+    exit();
+  }
+  else if ( $paths->getParam(0) == 'include' && $paths->getParam(1) == 'js' )
+  {
+    $path = $paths->getAllParams();
+    header('Location: ' . scriptPath . '/punbb/' . $path);
+    exit();
+  }
   else
   {
     punano_main();
@@ -80,7 +94,7 @@
   else if ( $session->auth_level < USER_LEVEL_ADMIN )
   {
     $url = makeUrlNS('Special', 'Login/' . $paths->page, 'level=' . USER_LEVEL_ADMIN, true);
-    redirect($url, 'Permission denied', 'You need to have an active high-privilege session to set up Punano.', 4);
+    pun_redirect($url, 'Permission denied', 'You need to have an active high-privilege session to set up Punano.', 4);
   }
   
   $template->header();
@@ -115,11 +129,13 @@
 function _punano_perform_install()
 {
   global $db, $session, $paths, $template, $plugins; // Common objects
+  global $dbdriver;
+  
   $db_prefix = table_prefix . 'pun_';
   $admin_email = getConfig('contact_email');
   $pun_version = PUNBB_VERSION;
   
-  $schema = file_get_contents( ENANO_ROOT . '/punbb/schema.sql' );
+  $schema = file_get_contents( ENANO_ROOT . "/punbb/install-$dbdriver.sql" );
   if ( empty($schema) )
   {
     echo 'ERROR: cannot load schema file!';
@@ -129,7 +145,8 @@
   $replace = array(
       '{{TABLE_PREFIX}}' => $db_prefix,
       '{{ENANO_ADMIN_EMAIL}}' => $admin_email,
-      '{{PUN_VERSION}}' => $pun_version
+      '{{PUN_VERSION}}' => $pun_version,
+      '{{NOW}}' => strval(time())
     );
   
   $schema = strtr($schema, $replace);
@@ -214,6 +231,7 @@
   // At this point, the PunBB API is already loaded
   // So we'll include one of the Pun frontend files
   
+  /*
   $valid = array('delete', 'edit', 'extern', 'help', 'index', 'misc', 'moderate', 'post', 'profile', 'search', 'userlist', 'viewforum', 'viewtopic');
   
   $file = 'index';
@@ -225,26 +243,28 @@
       $file = strtolower($x);
     }
   }
+  */
+  $file = 'rewrite';
   
   // Don't worry. This is sanitized.
-  require PUN_ROOT . $file . '.php';
-  
+  $file = PUN_ROOT . $file . '.php';
+  require $file;
 }
 
 function punano_admin_console()
 {
   global $db, $session, $paths, $template, $plugins; // Common objects
   
-  $valid = array('categories', 'censoring', 'forums', 'groups', 'index', 'loader', 'maintenance', 'options', 'permissions', 'prune', 'ranks', 'reports', 'users');
-  $mod = array('bans', 'censoring', 'index', 'loader', 'reports', 'users');
+  $valid = array('bans', 'categories', 'censoring', 'extensions', 'forums', 'groups', 'index', 'options', 'prune', 'ranks', 'reindex', 'reports', 'users');
+  $mod   = array();
 
   $file = 'index';
   
-  if ( $x = $paths->getParam(0) )
+  if ( $x = $paths->getParam(1) )
   {
     $x = preg_replace('/\.php$/', '', $x);
     $x = preg_replace('/^admin_/i', '', $x);
-    if ( in_array(strtolower($x), $valid) )
+    if ( in_array(strtolower($x), $valid) || in_array(strtolower($x), $mod) )
     {
       $file = strtolower($x);
     }
@@ -265,7 +285,7 @@
   }
   
   // Don't worry. This is sanitized.
-  require PUN_ROOT . 'admin_' . $file . '.php';
+  require PUN_ROOT . 'admin/' . $file . '.php';
   
 }
 

--- a/punbb/COPYING	Sun Sep 02 11:00:57 2007 -0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,340 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                       59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program 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.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
-Public License instead of this License.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/punbb/admin/bans.php	Sat Apr 05 23:56:45 2008 -0400
@@ -0,0 +1,487 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2002-2008  PunBB.org
+
+  This file is part of PunBB.
+
+  PunBB 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.
+
+  PunBB 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+
+// if (!defined('PUN_ROOT'))
+// 	define('PUN_ROOT', '../');
+// require PUN_ROOT.'include/common.php';
+require PUN_ROOT.'include/common_admin.php';
+
+// import globals (I really hope this isn't dangerous)
+foreach ( $GLOBALS as $key => $_ )
+{
+  $$key =& $GLOBALS[$key];
+}
+
+($hook = get_hook('aba_start')) ? eval($hook) : null;
+
+if ($pun_user['g_id'] != PUN_ADMIN && ($pun_user['g_moderator'] != '1' || $pun_user['g_mod_ban_users'] == '0'))
+	message($lang_common['No permission']);
+
+// Load the admin.php language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/admin.php';
+$GLOBALS['lang_admin'] = $lang_admin;
+
+
+// Add/edit a ban (stage 1)
+if (isset($_REQUEST['add_ban']) || isset($_GET['edit_ban']))
+{
+	if (isset($_GET['add_ban']) || isset($_POST['add_ban']))
+	{
+		// If the id of the user to ban was provided through GET (a link from profile.php)
+		if (isset($_GET['add_ban']))
+		{
+			$add_ban = intval($_GET['add_ban']);
+			if ($add_ban < 2)
+				message($lang_common['Bad request']);
+
+			$user_id = $add_ban;
+
+			($hook = get_hook('aba_add_ban_selected')) ? eval($hook) : null;
+
+			$query = array(
+				'SELECT'	=> 'u.group_id, u.username, u.email, u.registration_ip',
+				'FROM'		=> 'users AS u',
+				'WHERE'		=> 'u.id='.$user_id
+			);
+
+			($hook = get_hook('aba_qr_get_user_by_id')) ? eval($hook) : null;
+			$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+			if (!$pun_db->num_rows($result))
+				message($lang_admin['No user id message']);
+
+			list($group_id, $ban_user, $ban_email, $ban_ip) = $pun_db->fetch_row($result);
+		}
+		else	// Otherwise the username is in POST
+		{
+			$ban_user = trim($_POST['new_ban_user']);
+
+			($hook = get_hook('aba_add_ban_form_submitted')) ? eval($hook) : null;
+
+			if ($ban_user != '')
+			{
+				$query = array(
+					'SELECT'	=> 'u.id, u.group_id, u.username, u.email, u.registration_ip',
+					'FROM'		=> 'users AS u',
+					'WHERE'		=> 'u.username=\''.$pun_db->escape($ban_user).'\' AND u.id>1'
+				);
+
+				($hook = get_hook('aba_qr_get_user_by_username')) ? eval($hook) : null;
+				$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+				if (!$pun_db->num_rows($result))
+					message($lang_admin['No user username message']);
+
+				list($user_id, $group_id, $ban_user, $ban_email, $ban_ip) = $pun_db->fetch_row($result);
+			}
+		}
+
+		// Make sure we're not banning an admin
+		if (isset($group_id) && $group_id == PUN_ADMIN)
+			message($lang_admin['User is admin message']);
+
+		// If we have a $user_id, we can try to find the last known IP of that user
+		if (isset($user_id))
+		{
+			$query = array(
+				'SELECT'	=> 'p.poster_ip',
+				'FROM'		=> 'posts AS p',
+				'WHERE'		=> 'p.poster_id='.$user_id,
+				'ORDER BY'	=> 'p.posted DESC',
+				'LIMIT'		=> '1'
+			);
+
+			($hook = get_hook('aba_qr_get_last_known_ip')) ? eval($hook) : null;
+			$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+			$ban_ip = ($pun_db->num_rows($result)) ? $pun_db->result($result) : $ban_ip;
+		}
+
+		$mode = 'add';
+	}
+	else	// We are editing a ban
+	{
+		$ban_id = intval($_GET['edit_ban']);
+		if ($ban_id < 1)
+			message($lang_common['Bad request']);
+
+		($hook = get_hook('aba_edit_ban_selected')) ? eval($hook) : null;
+
+		$query = array(
+			'SELECT'	=> 'b.username, b.ip, b.email, b.message, b.expire',
+			'FROM'		=> 'bans AS b',
+			'WHERE'		=> 'b.id='.$ban_id
+		);
+
+		($hook = get_hook('aba_qr_get_ban_data')) ? eval($hook) : null;
+		$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+		if ($pun_db->num_rows($result))
+			list($ban_user, $ban_ip, $ban_email, $ban_message, $ban_expire) = $pun_db->fetch_row($result);
+		else
+			message($lang_common['Bad request']);
+
+		// We just use GMT for expire dates, as its a date rather than a day I don't think its worth worrying about
+		$ban_expire = ($ban_expire != '') ? gmdate('Y-m-d', $ban_expire) : '';
+
+		$mode = 'edit';
+	}
+
+
+	// Setup the form
+	$pun_page['fld_count'] = $pun_page['set_count'] = 0;
+
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		array($lang_admin['Bans'], pun_link($pun_url['admin_bans'])),
+		$lang_admin['Ban advanced']
+	);
+
+	($hook = get_hook('aba_add_edit_ban_pre_header_load')) ? eval($hook) : null;
+
+	define('PUN_PAGE_SECTION', 'users');
+	define('PUN_PAGE', 'admin-bans');
+	require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main admin sectioned">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Ban advanced heading'] ?></span></h2>
+		</div>
+		<div class="frm-info">
+			<p class="warn"><?php echo $lang_admin['Ban IP warning'] ?></p>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_bans']) ?>">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_bans'])) ?>" />
+				<input type="hidden" name="mode" value="<?php echo $mode ?>" />
+<?php if ($mode == 'edit'): ?>				<input type="hidden" name="ban_id" value="<?php echo $ban_id ?>" />
+<?php endif; ?>			</div>
+<?php ($hook = get_hook('aba_add_edit_ban_pre_criteria_fieldset')) ? eval($hook) : null; ?>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><span><?php echo $lang_admin['Ban criteria legend'] ?></span></legend>
+<?php ($hook = get_hook('aba_add_edit_ban_pre_username')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Username to ban'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="ban_user" size="25" maxlength="25" value="<?php if (isset($ban_user)) echo htmlspecialchars($ban_user); ?>" /></span>
+					</label>
+				</div>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['E-mail/domain to ban'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="ban_email" size="40" maxlength="80" value="<?php if (isset($ban_email)) echo strtolower($ban_email); ?>" /></span>
+						<span class="fld-help"><?php echo $lang_admin['E-mail/domain info'] ?></span>
+					</label>
+				</div>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['IP-addresses to ban'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="ban_ip" size="45" maxlength="255" value="<?php if (isset($ban_ip)) echo $ban_ip; ?>" /></span>
+						<span class="fld-help"><?php echo $lang_admin['IP-addresses info']; if ($ban_user != '' && isset($user_id)) echo ' '.$lang_admin['IP-addresses info 2'].'<a href="'.pun_link($pun_url['admin_users']).'&ip_stats='.$user_id.'">'.$lang_admin['IP-addresses info link'].'</a>' ?></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('aba_add_edit_ban_criteria_end')) ? eval($hook) : null; ?>
+			</fieldset>
+<?php ($hook = get_hook('aba_add_edit_ban_pre_settings_fieldset')) ? eval($hook) : null; ?>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><span><?php echo $lang_admin['Ban settings legend'] ?></span></legend>
+<?php ($hook = get_hook('aba_add_edit_ban_pre_message')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Ban message'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="ban_message" size="50" maxlength="255" value="<?php if (isset($ban_message)) echo htmlspecialchars($ban_message); ?>" /></span>
+						<span class="fld-help"><?php echo $lang_admin['Ban message info'] ?></span>
+					</label>
+				</div>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Expire date'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="ban_expire" size="17" maxlength="10" value="<?php if (isset($ban_expire)) echo $ban_expire; ?>" /></span>
+						<span class="fld-help"><?php echo $lang_admin['Expire date info'] ?></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('aba_add_edit_ban_settings_end')) ? eval($hook) : null; ?>
+			</fieldset>
+<?php ($hook = get_hook('aba_add_edit_ban_pre_buttons')) ? eval($hook) : null; ?>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="add_edit_ban" value=" <?php echo $lang_admin['Save'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+</div>
+<?php
+
+	require PUN_ROOT.'footer.php';
+}
+
+
+// Add/edit a ban (stage 2)
+else if (isset($_POST['add_edit_ban']))
+{
+	$ban_user = trim($_POST['ban_user']);
+	$ban_ip = trim($_POST['ban_ip']);
+	$ban_email = strtolower(trim($_POST['ban_email']));
+	$ban_message = trim($_POST['ban_message']);
+	$ban_expire = trim($_POST['ban_expire']);
+
+	if ($ban_user == '' && $ban_ip == '' && $ban_email == '')
+		message($lang_admin['Must enter message']);
+	else if (strtolower($ban_user) == 'guest')
+		message($lang_admin['Can\'t ban guest user']);
+
+	($hook = get_hook('aba_add_edit_ban_form_submitted2')) ? eval($hook) : null;
+
+	// Validate IP/IP range (it's overkill, I know)
+	if ($ban_ip != '')
+	{
+		$ban_ip = preg_replace('/[\s]{2,}/', ' ', $ban_ip);
+		$addresses = explode(' ', $ban_ip);
+		$addresses = array_map('trim', $addresses);
+
+		for ($i = 0; $i < count($addresses); ++$i)
+		{
+			$octets = explode('.', $addresses[$i]);
+
+			for ($c = 0; $c < count($octets); ++$c)
+			{
+				$octets[$c] = (strlen($octets[$c]) > 1) ? ltrim($octets[$c], "0") : $octets[$c];
+
+				if ($c > 3 || !ctype_digit($octets[$c]) || intval($octets[$c]) > 255)
+					message($lang_admin['Invalid IP message']);
+			}
+
+			$cur_address = implode('.', $octets);
+			$addresses[$i] = $cur_address;
+		}
+
+		$ban_ip = implode(' ', $addresses);
+	}
+
+	require PUN_ROOT.'include/email.php';
+	if ($ban_email != '' && !is_valid_email($ban_email))
+	{
+		if (!preg_match('/^[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/', $ban_email))
+			message($lang_admin['Invalid e-mail message']);
+	}
+
+	if ($ban_expire != '' && $ban_expire != 'Never')
+	{
+		$ban_expire = strtotime($ban_expire);
+
+		if ($ban_expire == -1 || $ban_expire <= time())
+			message($lang_admin['Invalid expire message']);
+	}
+	else
+		$ban_expire = 'NULL';
+
+	$ban_user = ($ban_user != '') ? '\''.$pun_db->escape($ban_user).'\'' : 'NULL';
+	$ban_ip = ($ban_ip != '') ? '\''.$pun_db->escape($ban_ip).'\'' : 'NULL';
+	$ban_email = ($ban_email != '') ? '\''.$pun_db->escape($ban_email).'\'' : 'NULL';
+	$ban_message = ($ban_message != '') ? '\''.$pun_db->escape($ban_message).'\'' : 'NULL';
+
+	if ($_POST['mode'] == 'add')
+	{
+		$query = array(
+			'INSERT'	=> 'username, ip, email, message, expire, ban_creator',
+			'INTO'		=> 'bans',
+			'VALUES'	=> $ban_user.', '.$ban_ip.', '.$ban_email.', '.$ban_message.', '.$ban_expire.', '.$pun_user['id']
+		);
+
+		($hook = get_hook('aba_qr_add_ban')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+	}
+	else
+	{
+		$query = array(
+			'UPDATE'	=> 'bans',
+			'SET'		=> 'username='.$ban_user.', ip='.$ban_ip.', email='.$ban_email.', message='.$ban_message.', expire='.$ban_expire,
+			'WHERE'		=> 'id='.intval($_POST['ban_id'])
+		);
+
+		($hook = get_hook('aba_qr_update_ban')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+	}
+
+	// Regenerate the bans cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_bans_cache();
+
+	pun_redirect(pun_link($pun_url['admin_bans']), (($_POST['mode'] == 'edit') ? $lang_admin['Ban edited'] : $lang_admin['Ban added']).' '.$lang_admin['Redirect']);
+}
+
+
+// Remove a ban
+else if (isset($_GET['del_ban']))
+{
+	$ban_id = intval($_GET['del_ban']);
+	if ($ban_id < 1)
+		message($lang_common['Bad request']);
+
+	// Validate the CSRF token
+	if (!isset($_POST['csrf_token']) && (!isset($_GET['csrf_token']) || $_GET['csrf_token'] !== generate_form_token('del_ban'.$ban_id)))
+		csrf_confirm_form();
+
+	($hook = get_hook('aba_del_ban_form_submitted2')) ? eval($hook) : null;
+
+	$query = array(
+		'DELETE'	=> 'bans',
+		'WHERE'		=> 'id='.$ban_id
+	);
+
+	($hook = get_hook('aba_qr_delete_ban')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the bans cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_bans_cache();
+
+	pun_redirect(pun_link($pun_url['admin_bans']), $lang_admin['Ban removed'].' '. $lang_admin['Redirect']);
+}
+
+
+// Setup the form
+$pun_page['part_count'] = $pun_page['fld_count'] = $pun_page['set_count'] = 0;
+
+// Setup breadcrumbs
+$pun_page['crumbs'] = array(
+	array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+	array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+	$lang_admin['Bans']
+);
+
+($hook = get_hook('aba_pre_header_loaded')) ? eval($hook) : null;
+
+define('PUN_PAGE_SECTION', 'users');
+define('PUN_PAGE', 'admin-bans');
+require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['New ban heading'] ?></span></h2>
+		</div>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['Advanced ban info'] ?></p>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_bans']) ?>&amp;action=more">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_bans']).'&action=more') ?>" />
+			</div>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo $lang_admin['New ban legend'] ?></strong></legend>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Username to ban'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="new_ban_user" size="25" maxlength="25" /></span>
+					</label>
+				</div>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="add_ban" value=" Add " /></span>
+			</div>
+		</form>
+	</div>
+<?php
+
+// Reset fieldset counter
+$pun_page['set_count'] = 0;
+
+?>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Existing bans heading'] ?></span></h2>
+		</div>
+<?php
+
+if (!empty($pun_bans))
+{
+	$pun_page['item_num'] = 0;
+	foreach ($pun_bans as $ban_key => $cur_ban)
+	{
+		$pun_page['ban_info'] = array();
+		$pun_page['ban_creator'] = ($cur_ban['ban_creator_username'] != '') ? '<a href="'.pun_link($pun_url['user'], $cur_ban['ban_creator']).'">'.htmlspecialchars($cur_ban['ban_creator_username']).'</a>' : $lang_admin['Unknown'];
+
+		if ($cur_ban['username'] != '')
+			$pun_page['ban_info'][] = '<span>'.$lang_admin['Username'].': '.htmlspecialchars($cur_ban['username']).'</span>';
+
+		if ($cur_ban['email'] != '')
+			$pun_page['ban_info'][] = '<span>'.$lang_admin['E-mail'].': '.$cur_ban['email'].'</span>';
+
+		if ($cur_ban['ip'] != '')
+			$pun_page['ban_info'][] = '<span>'.$lang_admin['IP-ranges'].': '.$cur_ban['ip'].'</span>';
+
+		if ($cur_ban['expire'] != '')
+			$pun_page['ban_info'][] = '<span>'.$lang_admin['Expire date'].': '.format_time($cur_ban['expire'], true).'</span>';
+
+		($hook = get_hook('aba_view_ban_pre_display')) ? eval($hook) : null;
+
+?>
+		<div class="ban-item databox db<?php echo ++$pun_page['item_num'] ?>">
+			<h3 class="legend"><span><?php printf($lang_admin['Current ban head'], $pun_page['ban_creator']) ?></span></h3>
+<?php if (!empty($pun_page['ban_info'])): ?>			<p class="data">
+				<?php echo implode('<br />', $pun_page['ban_info'])."\n" ?>
+			</p>
+<?php endif; if ($cur_ban['message'] != ''): ?>			<p><?php echo $lang_admin['Reason'].': '.htmlspecialchars($cur_ban['message']) ?></p>
+<?php endif; ?>		<p class="actions"><a href="<?php echo pun_link($pun_url['admin_bans']).'&edit_ban='.$cur_ban['id'] ?>"><?php echo $lang_admin['Edit'] ?></a> <a href="<?php echo pun_link($pun_url['admin_bans']).'&del_ban='.$cur_ban['id'].'&amp;csrf_token='.generate_form_token('del_ban'.$cur_ban['id']) ?>"><?php echo $lang_admin['Remove'] ?></a></p>
+</div>
+<?php
+
+	}
+}
+else
+{
+
+?>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['No bans'] ?></p>
+		</div>
+<?php
+
+}
+
+?>
+	</div>
+
+</div>
+<?php
+
+require PUN_ROOT.'footer.php';

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/punbb/admin/categories.php	Sat Apr 05 23:56:45 2008 -0400
@@ -0,0 +1,414 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2002-2008  PunBB.org
+
+  This file is part of PunBB.
+
+  PunBB 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.
+
+  PunBB 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+
+// if (!defined('PUN_ROOT'))
+// 	define('PUN_ROOT', '../');
+// require PUN_ROOT.'include/common.php';
+require PUN_ROOT.'include/common_admin.php';
+
+// import globals (I really hope this isn't dangerous)
+foreach ( $GLOBALS as $key => $_ )
+{
+  $$key =& $GLOBALS[$key];
+}
+
+($hook = get_hook('acg_start')) ? eval($hook) : null;
+
+if ($session->user_level < USER_LEVEL_ADMIN)
+	message($lang_common['No permission']);
+
+// Load the admin.php language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/admin.php';
+$GLOBALS['lang_admin'] = $lang_admin;
+
+
+// Add a new category
+if (isset($_POST['add_cat']))
+{
+	$new_cat_name = trim($_POST['new_cat_name']);
+	if ($new_cat_name == '')
+		message($lang_admin['Must name category']);
+
+	($hook = get_hook('acg_add_cat_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'INSERT'	=> 'cat_name',
+		'INTO'		=> 'categories',
+		'VALUES'	=> '\''.$pun_db->escape($new_cat_name).'\''
+	);
+
+	($hook = get_hook('acg_qr_add_category')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	pun_redirect(pun_link($pun_url['admin_categories']), $lang_admin['Category added'].' '.$lang_admin['Redirect']);
+}
+
+
+// Delete a category
+else if (isset($_POST['del_cat']) || isset($_POST['del_cat_comply']))
+{
+	$cat_to_delete = intval($_POST['cat_to_delete']);
+	if ($cat_to_delete < 1)
+		message($lang_common['Bad request']);
+
+	// User pressed the cancel button
+	if (isset($_POST['del_cat_cancel']))
+		pun_redirect(pun_link($pun_url['admin_categories']), $lang_admin['Cancel redirect']);
+
+	($hook = get_hook('acg_del_cat_form_submitted')) ? eval($hook) : null;
+
+	if (isset($_POST['del_cat_comply']))	// Delete a category with all forums and posts
+	{
+		@set_time_limit(0);
+
+		$query = array(
+			'SELECT'	=> 'f.id',
+			'FROM'		=> 'forums AS f',
+			'WHERE'		=> 'cat_id='.$cat_to_delete
+		);
+
+		($hook = get_hook('acg_qr_get_forums_to_delete')) ? eval($hook) : null;
+		$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+		$num_forums = $pun_db->num_rows($result);
+
+		for ($i = 0; $i < $num_forums; ++$i)
+		{
+			$cur_forum = $pun_db->result($result, $i);
+
+			// Prune all posts and topics
+			prune($cur_forum, 1, -1);
+
+			// Delete the forum
+			$query = array(
+				'DELETE'	=> 'forums',
+				'WHERE'		=> 'id='.$cur_forum
+			);
+
+			($hook = get_hook('acg_qr_delete_forum')) ? eval($hook) : null;
+			$pun_db->query_build($query) or error(__FILE__, __LINE__);
+		}
+
+		delete_orphans();
+
+		// Delete the category
+		$query = array(
+			'DELETE'	=> 'categories',
+			'WHERE'		=> 'id='.$cat_to_delete
+		);
+
+		($hook = get_hook('acg_qr_delete_category')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		// Regenerate the quickjump cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_quickjump_cache();
+
+		pun_redirect(pun_link($pun_url['admin_categories']), $lang_admin['Category deleted'].' '.$lang_admin['Redirect']);
+	}
+	else	// If the user hasn't comfirmed the delete
+	{
+		$query = array(
+			'SELECT'	=> 'c.cat_name',
+			'FROM'		=> 'categories AS c',
+			'WHERE'		=> 'c.id='.$cat_to_delete
+		);
+
+		($hook = get_hook('acg_qr_get_category_name')) ? eval($hook) : null;
+		$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+		$cat_name = $pun_db->result($result);
+
+
+		// Setup breadcrumbs
+		$pun_page['crumbs'] = array(
+			array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+			array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+			array($lang_admin['Categories'], pun_link($pun_url['admin_categories'])),
+			$lang_admin['Delete category']
+		);
+
+		($hook = get_hook('acg_del_cat_pre_header_load')) ? eval($hook) : null;
+
+		define('PUN_PAGE_SECTION', 'start');
+		define('PUN_PAGE', 'admin-categories');
+		require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php printf($lang_admin['Confirm delete cat'], htmlspecialchars($cat_name)) ?></span></h2>
+		</div>
+		<div class="frm-info">
+			<p class="warn"><?php echo $lang_admin['Delete category warning'] ?></p>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_categories']) ?>">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_categories'])) ?>" />
+				<input type="hidden" name="cat_to_delete" value="<?php echo $cat_to_delete ?>" />
+			</div>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="del_cat_comply" value="<?php echo $lang_admin['Delete'] ?>" /></span>
+				<span class="cancel"><input type="submit" name="del_cat_cancel" value="<?php echo $lang_admin['Cancel'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+</div>
+<?php
+
+		require PUN_ROOT.'footer.php';
+	}
+}
+
+
+else if (isset($_POST['update']))	// Change position and name of the categories
+{
+	$cat_order = array_map('intval', $_POST['cat_order']);
+	$cat_name = array_map('trim', $_POST['cat_name']);
+
+	($hook = get_hook('acg_update_cats_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'SELECT'	=> 'c.id, c.cat_name, c.disp_position',
+		'FROM'		=> 'categories AS c',
+		'ORDER BY'	=> 'c.id'
+	);
+
+	($hook = get_hook('acg_qr_get_categories')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	while ($cur_cat = $pun_db->fetch_assoc($result))
+	{
+		// If these aren't set, we're looking at a category that was added after
+		// the admin started editing: we don't want to mess with it
+		if (isset($cat_name[$cur_cat['id']]) && isset($cat_order[$cur_cat['id']]))
+		{
+			if ($cat_name[$cur_cat['id']] == '')
+				message($lang_admin['Must enter category']);
+
+			if ($cat_order[$cur_cat['id']] < 0)
+				message($lang_admin['Must be integer']);
+
+			// We only want to update if we changed anything
+			if ($cur_cat['cat_name'] != $cat_name[$cur_cat['id']] || $cur_cat['disp_position'] != $cat_order[$cur_cat['id']])
+			{
+				$query = array(
+					'UPDATE'	=> 'categories',
+					'SET'		=> 'cat_name=\''.$pun_db->escape($cat_name[$cur_cat['id']]).'\', disp_position='.$cat_order[$cur_cat['id']],
+					'WHERE'		=> 'id='.$cur_cat['id']
+				);
+
+				($hook = get_hook('acg_qr_update_category')) ? eval($hook) : null;
+				$pun_db->query_build($query) or error(__FILE__, __LINE__);
+			}
+		}
+	}
+
+	// Regenerate the quickjump cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_quickjump_cache();
+
+	pun_redirect(pun_link($pun_url['admin_categories']), $lang_admin['Categories updated'].' '.$lang_admin['Redirect']);
+}
+
+
+// Generate an array with all categories
+$query = array(
+	'SELECT'	=> 'c.id, c.cat_name, c.disp_position',
+	'FROM'		=> 'categories AS c',
+	'ORDER BY'	=> 'c.disp_position'
+);
+
+($hook = get_hook('acg_qr_get_categories2')) ? eval($hook) : null;
+$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+$num_cats = $pun_db->num_rows($result);
+
+for ($i = 0; $i < $num_cats; ++$i)
+	$cat_list[] = $pun_db->fetch_row($result);
+
+// Setup the form
+$pun_page['fld_count'] = $pun_page['set_count'] = $pun_page['part_count'] = 0;
+
+
+// Setup breadcrumbs
+$pun_page['crumbs'] = array(
+	array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+	array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+	$lang_admin['Categories']
+);
+
+($hook = get_hook('acg_cat_header_load')) ? eval($hook) : null;
+
+define('PUN_PAGE_SECTION', 'start');
+define('PUN_PAGE', 'admin-categories');
+require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php printf($lang_admin['Add category head'], '<strong>'.$lang_admin['Add category'].'</strong>') ?></span></h2>
+		</div>
+		<div class="frm-info">
+			<p><?php printf($lang_admin['Add category info'], '<a href="'.pun_link($pun_url['admin_forums']).'">'.strtolower($lang_admin['Forums']).'</a>') ?></p>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_categories']) ?>&amp;action=foo">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_categories']).'&amp;action=foo') ?>" />
+			</div>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo $lang_admin['Add category'] ?></strong></legend>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['New category name'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="new_cat_name" size="35" maxlength="80" /></span>
+					</label>
+				</div>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Position'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="position" size="3" maxlength="3" /></span>
+						<span class="fld-extra"><?php echo $lang_admin['Category position help'] ?></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acg_add_cat_fieldset_end')) ? eval($hook) : null; ?>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="add_cat" value="<?php echo $lang_admin['Add category'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+<?php
+
+($hook = get_hook('acg_new_form')) ? eval($hook) : null;
+
+// Reset fieldset counter
+$pun_page['set_count'] = 0;
+
+if ($num_cats)
+{
+
+?>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php printf($lang_admin['Del category head'], '<strong>'.$lang_admin['Delete category'].'</strong>') ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_categories']) ?>&amp;action=foo">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_categories']).'&action=foo') ?>" />
+			</div>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo $lang_admin['Delete category'] ?></strong></legend>
+				<div class="frm-fld select">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Category to delete'] ?></span><br />
+						<span class="fld-input"><select id="fld<?php echo $pun_page['fld_count'] ?>" name="cat_to_delete">
+<?php
+
+	while (list(, list($cat_id, $cat_name, ,)) = @each($cat_list))
+		echo "\t\t\t\t\t\t\t".'<option value="'.$cat_id.'">'.htmlspecialchars($cat_name).'</option>'."\n";
+
+?>
+						</select></span>
+						<span class="fld-help"><?php echo $lang_admin['Requires confirmation'] ?></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acg_del_cat_fieldset_end')) ? eval($hook) : null; ?>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="del_cat" value="<?php echo $lang_admin['Delete category'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php printf($lang_admin['Edit categories head'], '<strong>'.$lang_admin['Edit categories'].'</strong>') ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_categories']) ?>&amp;action=foo">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_categories']).'&action=foo') ?>" />
+			</div>
+
+<?php
+
+	@reset($cat_list);
+	for ($i = 0; $i < $num_cats; ++$i)
+	{
+		list(, list($cat_id, $cat_name, $position)) = @each($cat_list);
+		// Reset fieldset counter
+		$pun_page['set_count'] = 0;
+
+?>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo htmlspecialchars($cat_name) ?>: </strong></legend>
+				<div class="frm-fld text twin">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>" class="twin1">
+						<span class="fld-label"><?php echo $lang_admin['Edit category name'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="cat_name[<?php echo $cat_id ?>]" value="<?php echo htmlspecialchars($cat_name) ?>" size="35" maxlength="80" /></span>
+					</label><br />
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>" class="twin2">
+						<span class="fld-label"><?php echo $lang_admin['Change category position'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="cat_order[<?php echo $cat_id ?>]" value="<?php echo $position ?>" size="3" maxlength="3" /></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acg_edit_cat_fieldset_end')) ? eval($hook) : null; ?>
+			</fieldset>
+<?php
+
+	}
+
+?>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="update" value="<?php echo $lang_admin['Update all'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+<?php
+
+	($hook = get_hook('acg_has_cats_new_form')) ? eval($hook) : null;
+}
+
+?>
+
+</div>
+<?php
+
+require PUN_ROOT.'footer.php';

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/punbb/admin/censoring.php	Sat Apr 05 23:56:45 2008 -0400
@@ -0,0 +1,272 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2002-2008  PunBB.org
+
+  This file is part of PunBB.
+
+  PunBB 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.
+
+  PunBB 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+
+// if (!defined('PUN_ROOT'))
+// 	define('PUN_ROOT', '../');
+// require PUN_ROOT.'include/common.php';
+require PUN_ROOT.'include/common_admin.php';
+
+// import globals (I really hope this isn't dangerous)
+foreach ( $GLOBALS as $key => $_ )
+{
+  $$key =& $GLOBALS[$key];
+}
+
+($hook = get_hook('acs_start')) ? eval($hook) : null;
+
+if (!$pun_user['is_admmod'])
+	message($lang_common['No permission']);
+
+// Load the admin.php language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/admin.php';
+$GLOBALS['lang_admin'] = $lang_admin;
+
+
+// Add a censor word
+if (isset($_POST['add_word']))
+{
+	$search_for = trim($_POST['new_search_for']);
+	$replace_with = trim($_POST['new_replace_with']);
+
+	if ($search_for == '' || $replace_with == '')
+		message($lang_admin['Must enter text message']);
+
+	($hook = get_hook('acs_add_word_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'INSERT'	=> 'search_for, replace_with',
+		'INTO'		=> 'censoring',
+		'VALUES'	=> '\''.$pun_db->escape($search_for).'\', \''.$pun_db->escape($replace_with).'\''
+	);
+
+	($hook = get_hook('acs_qr_add_censor')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the censor cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_censors_cache();
+
+	pun_redirect(pun_link($pun_url['admin_censoring']), $lang_admin['Censor word added'].' '.$lang_admin['Redirect']);
+}
+
+
+// Update a censor word
+else if (isset($_POST['update']))
+{
+	$id = intval(key($_POST['update']));
+
+	$search_for = trim($_POST['search_for'][$id]);
+	$replace_with = trim($_POST['replace_with'][$id]);
+
+	if ($search_for == '' || $replace_with == '')
+		message($lang_admin['Must enter text message']);
+
+	($hook = get_hook('acs_update_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'UPDATE'	=> 'censoring',
+		'SET'		=> 'search_for=\''.$pun_db->escape($search_for).'\', replace_with=\''.$pun_db->escape($replace_with).'\'',
+		'WHERE'		=> 'id='.$id
+	);
+
+	($hook = get_hook('acs_qr_update_censor')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the censor cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_censors_cache();
+
+	pun_redirect(pun_link($pun_url['admin_censoring']), $lang_admin['Censor word updated'].' '.$lang_admin['Redirect']);
+}
+
+
+// Remove a censor word
+else if (isset($_POST['remove']))
+{
+	$id = intval(key($_POST['remove']));
+
+	($hook = get_hook('acs_remove_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'DELETE'	=> 'censoring',
+		'WHERE'		=> 'id='.$id
+	);
+
+	($hook = get_hook('acs_qr_delete_censor')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the censor cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_censors_cache();
+
+	pun_redirect(pun_link($pun_url['admin_censoring']), $lang_admin['Censor word removed'].' '.$lang_admin['Redirect']);
+}
+
+
+// Load the cached censors
+if (file_exists(PUN_CACHE_DIR.'cache_censors.php'))
+	include PUN_CACHE_DIR.'cache_censors.php';
+
+if (!defined('PUN_CENSORS_LOADED'))
+{
+	require_once PUN_ROOT.'include/cache.php';
+	generate_censors_cache();
+	require PUN_CACHE_DIR.'cache_censors.php';
+}
+
+
+// Setup the form
+$pun_page['part_count'] = $pun_page['fld_count'] = $pun_page['set_count'] = 0;
+
+// Setup breadcrumbs
+$pun_page['crumbs'] = array(
+	array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+	array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+	$lang_admin['Censoring']
+);
+
+($hook = get_hook('acs_pre_header_load')) ? eval($hook) : null;
+
+define('PUN_PAGE_SECTION', 'options');
+define('PUN_PAGE', 'admin-censoring');
+require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Add censored word head'] ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_censoring']) ?>&amp;action=foo">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_censoring']).'&action=foo') ?>" />
+			</div>
+			<div class="frm-info">
+				<p><?php printf($lang_admin['Add censored word intro'], '<strong><a href="'.pun_link($pun_url['admin_options_features']).'#fs4">'.$lang_admin['Options'].' - '.$lang_admin['Features'].'</a></strong>') ?></p>
+			</div>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><span><?php echo $lang_admin['Add censored word legend'] ?></span></legend>
+<?php ($hook = get_hook('acs_add_word_pre_search_for')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Censored word'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="new_search_for" size="24" maxlength="60" /></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acs_add_word_pre_replace_with')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Censored replacement text'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="new_replace_with" size="24" maxlength="60" /></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acs_add_word_end')) ? eval($hook) : null; ?>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="add_word" value=" <?php echo $lang_admin['Add'] ?> " /></span>
+			</div>
+		</form>
+	</div>
+<?php
+
+if (!empty($pun_censors))
+{
+	// Reset fieldset counter
+	$pun_page['set_count'] = 0;
+
+?>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Edit censored word legend'] ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_censoring']) ?>&amp;action=foo">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_censoring']).'&action=foo') ?>" />
+			</div>
+<?php
+
+	foreach ($pun_censors as $censor_key => $cur_word)
+	{
+
+	?>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><span><?php echo $lang_admin['Edit censored word legend'] ?></span></legend>
+<?php ($hook = get_hook('acs_edit_word_pre_search_for')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Censored word'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="search_for[<?php echo $cur_word['id'] ?>]" value="<?php echo htmlspecialchars($cur_word['search_for']) ?>" size="24" maxlength="60" /></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('acs_edit_word_pre_replace_with')) ? eval($hook) : null; ?>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Censored replacement text'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="replace_with[<?php echo $cur_word['id'] ?>]" value="<?php echo htmlspecialchars($cur_word['replace_with']) ?>" size="24" maxlength="60" /></span>
+					</label>
+					<span class="submit"><input type="submit" name="update[<?php echo $cur_word['id'] ?>]" value="<?php echo $lang_admin['Update'] ?>" /> <input type="submit" name="remove[<?php echo $cur_word['id'] ?>]" value="<?php echo $lang_admin['Remove'] ?>" /></span>
+				</div>
+<?php ($hook = get_hook('acs_edit_word_end')) ? eval($hook) : null; ?>
+			</fieldset>
+	<?php
+
+	}
+
+?>
+		</form>
+	</div>
+<?php
+
+}
+else
+{
+
+?>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Edit censored word legend'] ?></span></h2>
+		</div>
+		<div class="frm-form">
+			<div class="frm-info">
+				<p><?php echo $lang_admin['No censored words'] ?></p>
+			</div>
+		</div>
+	</div>
+<?php
+
+}
+
+?>
+</div>
+<?php
+
+require PUN_ROOT.'footer.php';

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/punbb/admin/extensions.php	Sat Apr 05 23:56:45 2008 -0400
@@ -0,0 +1,738 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2002-2008  PunBB.org
+
+  This file is part of PunBB.
+
+  PunBB 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.
+
+  PunBB 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+
+// if (!defined('PUN_ROOT'))
+// 	define('PUN_ROOT', '../');
+// require PUN_ROOT.'include/common.php';
+require PUN_ROOT.'include/common_admin.php';
+
+// import globals (I really hope this isn't dangerous)
+foreach ( $GLOBALS as $key => $_ )
+{
+  $$key =& $GLOBALS[$key];
+}
+require_once PUN_ROOT.'include/xml.php';
+
+($hook = get_hook('aex_start')) ? eval($hook) : null;
+
+if ($session->user_level < USER_LEVEL_ADMIN)
+	message($lang_common['No permission']);
+
+// Load the admin.php language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/admin.php';
+$GLOBALS['lang_admin'] = $lang_admin;
+
+// Make sure we have XML support
+if (!function_exists('xml_parser_create'))
+	message($lang_admin['No XML support']);
+
+$section = isset($_GET['section']) ? $_GET['section'] : null;
+
+
+// Install an extension
+if (isset($_GET['install']) || isset($_GET['install_hotfix']))
+{
+	($hook = get_hook('aex_install_selected')) ? eval($hook) : null;
+
+	// User pressed the cancel button
+	if (isset($_POST['install_cancel']))
+		pun_redirect(pun_link($pun_url['admin_extensions_install']), $lang_admin['Cancel redirect']);
+
+	$id = preg_replace('/[^0-9a-z_]/', '', isset($_GET['install']) ? $_GET['install'] : $_GET['install_hotfix']);
+
+	// Load manifest (either locally or from punbb.org updates service)
+	if (isset($_GET['install']))
+		$manifest = @file_get_contents(PUN_ROOT.'extensions/'.$id.'/manifest.xml');
+	else
+		$manifest = @end(get_remote_file('http://punbb.org/update/manifest/'.$id.'.xml', 16));
+
+	// Parse manifest.xml into an array and validate it
+	$ext_data = xml_to_array($manifest);
+	$errors = validate_manifest($ext_data, $id);
+
+	if (!empty($errors))
+		message(isset($_GET['install']) ? $lang_common['Bad request'] : $lang_admin['Hotfix download failed']);
+
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		array($lang_admin['Install extensions'], pun_link($pun_url['admin_extensions_install'])),
+		$lang_admin['Install extension']
+	);
+
+	if (isset($_POST['install_comply']))
+	{
+		($hook = get_hook('aex_install_comply_form_submitted')) ? eval($hook) : null;
+
+		// Is there some uninstall code to store in the db?
+		$uninstall_code = (isset($ext_data['extension']['uninstall']) && trim($ext_data['extension']['uninstall']) != '') ? '\''.$pun_db->escape(trim($ext_data['extension']['uninstall'])).'\'' : 'NULL';
+
+		// Is there an uninstall note to store in the db?
+		$uninstall_note = 'NULL';
+		foreach ($ext_data['extension']['note'] as $cur_note)
+		{
+			if ($cur_note['attributes']['type'] == 'uninstall' && trim($cur_note['content']) != '')
+				$uninstall_note = '\''.$pun_db->escape(trim($cur_note['content'])).'\'';
+		}
+
+		$notices = array();
+
+		// Is this a fresh install or an upgrade?
+		$query = array(
+			'SELECT'	=> 'e.version',
+			'FROM'		=> 'extensions AS e',
+			'WHERE'		=> 'e.id=\''.$pun_db->escape($id).'\''
+		);
+
+		($hook = get_hook('aex_qr_get_current_ext_version')) ? eval($hook) : null;
+		$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+		if ($pun_db->num_rows($result))
+		{
+			// EXT_CUR_VERSION will be available to the extension install routine (to facilitate extension upgrades)
+			define('EXT_CUR_VERSION', $pun_db->result($result));
+
+			// Run the author supplied install code
+			if (isset($ext_data['extension']['install']) && trim($ext_data['extension']['install']) != '')
+				eval($ext_data['extension']['install']);
+
+			// Update the existing extension
+			$query = array(
+				'UPDATE'	=> 'extensions',
+				'SET'		=> 'title=\''.$pun_db->escape($ext_data['extension']['title']).'\', version=\''.$pun_db->escape($ext_data['extension']['version']).'\', description=\''.$pun_db->escape($ext_data['extension']['description']).'\', author=\''.$pun_db->escape($ext_data['extension']['author']).'\', uninstall='.$uninstall_code.', uninstall_note='.$uninstall_note,
+				'WHERE'		=> 'id=\''.$pun_db->escape($id).'\''
+			);
+
+			($hook = get_hook('aex_qr_update_ext')) ? eval($hook) : null;
+			$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+			// Delete the old hooks
+			$query = array(
+				'DELETE'	=> 'extension_hooks',
+				'WHERE'		=> 'extension_id=\''.$pun_db->escape($id).'\''
+			);
+
+			($hook = get_hook('aex_qr_delete_hooks')) ? eval($hook) : null;
+			$pun_db->query_build($query) or error(__FILE__, __LINE__);
+		}
+		else
+		{
+			// Run the author supplied install code
+			if (isset($ext_data['extension']['install']) && trim($ext_data['extension']['install']) != '')
+				eval($ext_data['extension']['install']);
+
+			// Add the new extension
+			$query = array(
+				'INSERT'	=> 'id, title, version, description, author, uninstall, uninstall_note',
+				'INTO'		=> 'extensions',
+				'VALUES'	=> '\''.$pun_db->escape($ext_data['extension']['id']).'\', \''.$pun_db->escape($ext_data['extension']['title']).'\', \''.$pun_db->escape($ext_data['extension']['version']).'\', \''.$pun_db->escape($ext_data['extension']['description']).'\', \''.$pun_db->escape($ext_data['extension']['author']).'\', '.$uninstall_code.', '.$uninstall_note
+			);
+
+			($hook = get_hook('aex_qr_add_ext')) ? eval($hook) : null;
+			$pun_db->query_build($query) or error(__FILE__, __LINE__);
+		}
+
+		// Now insert the hooks
+		foreach ($ext_data['extension']['hooks']['hook'] as $hook)
+		{
+			$query = array(
+				'INSERT'	=> 'id, extension_id, code, installed',
+				'INTO'		=> 'extension_hooks',
+				'VALUES'	=> '\''.$pun_db->escape(trim($hook['attributes']['id'])).'\', \''.$pun_db->escape($id).'\', \''.$pun_db->escape(trim($hook['content'])).'\', '.time()
+			);
+
+			($hook = get_hook('aex_qr_add_hook')) ? eval($hook) : null;
+			$pun_db->query_build($query) or error(__FILE__, __LINE__);
+		}
+
+		// Empty the PHP cache
+		$d = dir(PUN_CACHE_DIR);
+		while (($entry = $d->read()) !== false)
+		{
+			if (substr($entry, strlen($entry)-4) == '.php')
+				@unlink(PUN_CACHE_DIR.$entry);
+		}
+		$d->close();
+
+		// Regenerate the hooks cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_hooks_cache();
+
+		// Display notices if there are any
+		if (!empty($notices))
+		{
+			($hook = get_hook('aex_install_notices_pre_header_load')) ? eval($hook) : null;
+
+			define('PUN_PAGE_SECTION', 'extensions');
+			define('PUN_PAGE', 'admin-extensions-install');
+			require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo end($pun_page['crumbs']) ?> "<?php echo htmlspecialchars($ext_data['extension']['title']) ?>"</span></h2>
+		</div>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['Extension installed info'] ?></p>
+			<ul>
+<?php
+
+			while (list(, $cur_notice) = each($notices))
+				echo "\t\t\t\t".'<li><span>'.$cur_notice.'</span></li>'."\n";
+
+?>
+			</ul>
+			<p><a href="<?php echo pun_link($pun_url['admin_extensions_manage']) ?>"><?php echo $lang_admin['Manage extensions'] ?></a></p>
+		</div>
+	</div>
+
+</div>
+<?php
+
+			require PUN_ROOT.'footer.php';
+		}
+		else
+			pun_redirect(pun_link($pun_url['admin_extensions_manage']), $lang_admin['Extension installed'].' '.$lang_admin['Redirect']);
+	}
+
+
+	($hook = get_hook('aex_install_pre_header_load')) ? eval($hook) : null;
+
+	define('PUN_PAGE_SECTION', 'extensions');
+	define('PUN_PAGE', 'admin-extensions-install');
+	require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo end($pun_page['crumbs']) ?> "<?php echo htmlspecialchars($ext_data['extension']['title']) ?>"</span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $base_url.'/admin/extensions.php'.(isset($_GET['install']) ? '?install=' : '?install_hotfix=').$id ?>">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token($base_url.'/admin/extensions.php'.(isset($_GET['install']) ? '?install=' : '?install_hotfix=').$id) ?>" />
+			</div>
+			<div class="ext-item databox">
+				<h3 class="legend"><span><?php echo htmlspecialchars($ext_data['extension']['title']).((strpos($id, 'hotfix_') !== 0) ? ' v'.$ext_data['extension']['version'] : '') ?></span></h3>
+				<p><span><?php printf($lang_admin['Extension by'], $ext_data['extension']['author']) ?></span><br /><span><?php echo htmlspecialchars($ext_data['extension']['description']) ?></span></p>
+<?php
+
+	// Setup an array of warnings to display in the form
+	$form_warnings = array();
+	$pun_page['num_items'] = 0;
+
+	foreach ($ext_data['extension']['note'] as $cur_note)
+	{
+		if ($cur_note['attributes']['type'] == 'install')
+			$form_warnings[] = '<p>'.++$pun_page['num_items'].'. '.htmlspecialchars($cur_note['content']).'</p>';
+	}
+
+	if (version_compare(clean_version($pun_config['o_cur_version']), clean_version($ext_data['extension']['maxtestedon']), '>'))
+		$form_warnings[] = '<p>'.++$pun_page['num_items'].'. '.$lang_admin['Maxtestedon warning'].'</p>';
+
+	if (!empty($form_warnings))
+	{
+
+?>
+				<h4 class="note"><?php echo $lang_admin['Install note'] ?></h4>
+<?php
+
+		echo implode("\n\t\t\t\t\t", $form_warnings)."\n";
+	}
+
+?>
+			</div>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="install_comply" value="<?php echo ((strpos($id, 'hotfix_') !== 0) ? $lang_admin['Install extension'] : $lang_admin['Install hotfix']) ?>" /></span>
+				<span class="cancel"><input type="submit" name="install_cancel" value="<?php echo $lang_admin['Cancel'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+</div>
+<?php
+
+	require PUN_ROOT.'footer.php';
+}
+
+
+// Uninstall an extension
+else if (isset($_GET['uninstall']))
+{
+	// User pressed the cancel button
+	if (isset($_POST['uninstall_cancel']))
+		pun_redirect(pun_link($pun_url['admin_extensions_manage']), $lang_admin['Cancel redirect']);
+
+	($hook = get_hook('aex_uninstall_selected')) ? eval($hook) : null;
+
+	$id = preg_replace('/[^0-9a-z_]/', '', $_GET['uninstall']);
+
+	// Fetch info about the extension
+	$query = array(
+		'SELECT'	=> 'e.title, e.version, e.description, e.author, e.uninstall, e.uninstall_note',
+		'FROM'		=> 'extensions AS e',
+		'WHERE'		=> 'e.id=\''.$pun_db->escape($id).'\''
+	);
+
+	($hook = get_hook('aex_qr_get_extension')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	if (!$pun_db->num_rows($result))
+		message($lang_common['Bad request']);
+
+	$ext_data = $pun_db->fetch_assoc($result);
+
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		array($lang_admin['Manage extensions'], pun_link($pun_url['admin_extensions_manage'])),
+		$lang_admin['Uninstall extension']
+	);
+
+	// If the user has confirmed the uninstall
+	if (isset($_POST['uninstall_comply']))
+	{
+		($hook = get_hook('aex_uninstall_comply_form_submitted')) ? eval($hook) : null;
+
+		$notices = array();
+
+		// Run uninstall code
+		eval($ext_data['uninstall']);
+
+		// Now delete the extension and its hooks from the db
+		$query = array(
+			'DELETE'	=> 'extension_hooks',
+			'WHERE'		=> 'extension_id=\''.$pun_db->escape($id).'\''
+		);
+
+		($hook = get_hook('aex_qr_delete_hooks')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		$query = array(
+			'DELETE'	=> 'extensions',
+			'WHERE'		=> 'id=\''.$pun_db->escape($id).'\''
+		);
+
+		($hook = get_hook('aex_qr_delete_extension')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		// Empty the PHP cache
+		$d = dir(PUN_CACHE_DIR);
+		while (($entry = $d->read()) !== false)
+		{
+			if (substr($entry, strlen($entry)-4) == '.php')
+				@unlink(PUN_CACHE_DIR.$entry);
+		}
+		$d->close();
+
+		// Regenerate the hooks cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_hooks_cache();
+
+		// Display notices if there are any
+		if (!empty($notices))
+		{
+			($hook = get_hook('aex_uninstall_notices_pre_header_load')) ? eval($hook) : null;
+
+			define('PUN_PAGE_SECTION', 'extensions');
+			define('PUN_PAGE', 'admin-extensions-manage');
+			require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo end($pun_page['crumbs']) ?> "<?php echo htmlspecialchars($ext_data['title']) ?>"</span></h2>
+		</div>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['Extension uninstalled info'] ?></p>
+			<ul>
+<?php
+
+			while (list(, $cur_notice) = each($notices))
+				echo "\t\t\t\t".'<li><span>'.$cur_notice.'</span></li>'."\n";
+
+?>
+			</ul>
+			<p><a href="<?php echo pun_link($pun_url['admin_extensions_manage']) ?>"><?php echo $lang_admin['Manage extensions'] ?></a></p>
+		</div>
+	</div>
+
+</div>
+<?php
+
+			require PUN_ROOT.'footer.php';
+		}
+		else
+			pun_redirect(pun_link($pun_url['admin_extensions_manage']), $lang_admin['Extension uninstalled'].' '.$lang_admin['Redirect']);
+	}
+	else	// If the user hasn't confirmed the uninstall
+	{
+		($hook = get_hook('aex_uninstall_pre_header_loaded')) ? eval($hook) : null;
+
+		define('PUN_PAGE_SECTION', 'extensions');
+		define('PUN_PAGE', 'admin-extensions-manage');
+		require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo end($pun_page['crumbs']) ?> "<?php echo htmlspecialchars($ext_data['title']) ?>"</span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $base_url ?>/admin/extensions.php?section=manage&amp;uninstall=<?php echo $id ?>">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token($base_url.'/admin/extensions.php?section=manage&amp;uninstall='.$id) ?>" />
+			</div>
+			<div class="ext-item databox">
+				<h3 class="legend"><span><?php echo htmlspecialchars($ext_data['title']).((strpos($id, 'hotfix_') !== 0) ? ' v'.$ext_data['version'] : '') ?></span></h3>
+				<p><span><?php printf($lang_admin['Extension by'], $ext_data['author']) ?></span><br /><span><?php echo htmlspecialchars($ext_data['description']) ?></span></p>
+<?php if ($ext_data['uninstall_note'] != ''): ?>				<h4><?php echo $lang_admin['Uninstall note'] ?></h4>
+				<p><?php echo htmlspecialchars($ext_data['uninstall_note']) ?></p>
+<?php endif; ?>			</div>
+			<div class="frm-info">
+				<p class="warn"><?php echo $lang_admin['Installed extensions warn'] ?></p>
+			</div>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="uninstall_comply" value="<?php echo $lang_admin['Uninstall'] ?>" /></span>
+				<span class="cancel"><input type="submit" class="button" name="uninstall_cancel" value="<?php echo $lang_admin['Cancel'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+</div>
+<?php
+
+		require PUN_ROOT.'footer.php';
+	}
+}
+
+
+// Enable or disable an extension
+else if (isset($_GET['flip']))
+{
+	$id = preg_replace('/[^0-9a-z_]/', '', $_GET['flip']);
+
+	// We validate the CSRF token. If it's set in POST and we're at this point, the token is valid.
+	// If it's in GET, we need to make sure it's valid.
+	if (!isset($_POST['csrf_token']) && (!isset($_GET['csrf_token']) || $_GET['csrf_token'] !== generate_form_token('flip'.$id)))
+		csrf_confirm_form();
+
+	($hook = get_hook('aex_flip_selected')) ? eval($hook) : null;
+
+	// Fetch the current status of the extension
+	$query = array(
+		'SELECT'	=> 'e.disabled',
+		'FROM'		=> 'extensions AS e',
+		'WHERE'		=> 'e.id=\''.$pun_db->escape($id).'\''
+	);
+
+	($hook = get_hook('aex_qr_get_disabled_status')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	if (!$pun_db->num_rows($result))
+		message($lang_common['Bad request']);
+
+	// Are we disabling or enabling?
+	$disable = $pun_db->result($result) == '0';
+
+	$query = array(
+		'UPDATE'	=> 'extensions',
+		'SET'		=> 'disabled='.($disable ? '1' : '0'),
+		'WHERE'		=> 'id=\''.$pun_db->escape($id).'\''
+	);
+
+	($hook = get_hook('aex_qr_update_disabled_status')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the hooks cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_hooks_cache();
+
+	pun_redirect(pun_link($pun_url['admin_extensions_manage']), ($disable ? $lang_admin['Extension disabled'] : $lang_admin['Extension enabled']).' '.$lang_admin['Redirect']);
+}
+
+($hook = get_hook('aex_new_action')) ? eval($hook) : null;
+
+
+// Generate an array of installed extensions
+$inst_exts = array();
+$query = array(
+	'SELECT'	=> 'e.*',
+	'FROM'		=> 'extensions AS e',
+	'ORDER BY'	=> 'e.title'
+);
+
+($hook = get_hook('aex_qr_get_all_extensions')) ? eval($hook) : null;
+$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+while ($cur_ext = $pun_db->fetch_assoc($result))
+	$inst_exts[$cur_ext['id']] = $cur_ext;
+
+
+if ($section == 'install')
+{
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		$lang_admin['Install extensions']
+	);
+
+	($hook = get_hook('aex_section_install_pre_header_load')) ? eval($hook) : null;
+
+	define('PUN_PAGE_SECTION', 'extensions');
+	define('PUN_PAGE', 'admin-extensions-install');
+
+	require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Extensions available'] ?></span></h2>
+		</div>
+<?php
+
+	$num_exts = 0;
+	$num_failed = 0;
+	$pun_page['item_num'] = 1;
+	$pun_page['ext_item'] = array();
+	$pun_page['ext_error'] = array();
+
+	// Loop through any available hotfixes
+	if (isset($pun_updates['hotfix']))
+	{
+		// If there's only one hotfix, add one layer of arrays so we can foreach over it
+		if (!is_array(current($pun_updates['hotfix'])))
+			$pun_updates['hotfix'] = array($pun_updates['hotfix']);
+
+		foreach ($pun_updates['hotfix'] as $hotfix)
+		{
+			if (!array_key_exists($hotfix['attributes']['id'], $inst_exts))
+			{
+				$pun_page['ext_item'][] = '<div class="hotfix-item databox">'."\n\t\t\t".'<h3 class="legend"><span>'.htmlspecialchars($hotfix['content']).'</span></h3>'."\n\t\t\t".'<p><span>'.sprintf($lang_admin['Extension by'], 'PunBB').'</span><br /><span>'.$lang_admin['Hotfix description'].'</span></p>'."\n\t\t\t".'<p class="actions"><a href="'.$base_url.'/admin/extensions.php?install_hotfix='.urlencode($hotfix['attributes']['id']).'">'.$lang_admin['Install hotfix'].'</a></p>'."\n\t\t".'</div>';
+				++$num_exts;
+			}
+		}
+	}
+
+	$d = dir(PUN_ROOT.'extensions');
+	while (($entry = $d->read()) !== false)
+	{
+		if ($entry{0} != '.' && is_dir(PUN_ROOT.'extensions/'.$entry))
+		{
+			if (preg_match('/[^0-9a-z_]/', $entry))
+			{
+				$pun_page['ext_error'][] = '<div class="ext-error databox db'.++$pun_page['item_num'].'">'."\n\t\t\t\t".'<h3 class="legend"><span>'.sprintf($lang_admin['Extension loading error'], htmlspecialchars($entry)).'<span></h3>'."\n\t\t\t\t".'<p>'.$lang_admin['Illegal ID'].'</p>'."\n\t\t\t".'</div>';
+				++$num_failed;
+				continue;
+			}
+			else if (!file_exists(PUN_ROOT.'extensions/'.$entry.'/manifest.xml'))
+			{
+				$pun_page['ext_error'][] = '<div class="ext-error databox db'.++$pun_page['item_num'].'">'."\n\t\t\t\t".'<h3 class="legend"><span>'.sprintf($lang_admin['Extension loading error'], htmlspecialchars($entry)).'<span></h3>'."\n\t\t\t\t".'<p>'.$lang_admin['Missing manifest'].'</p>'."\n\t\t\t".'</div>';
+				++$num_failed;
+				continue;
+			}
+
+			// Parse manifest.xml into an array
+			$ext_data = xml_to_array(@file_get_contents(PUN_ROOT.'extensions/'.$entry.'/manifest.xml'));
+			if (empty($ext_data))
+			{
+				$pun_page['ext_error'][] = '<div class="ext-error databox db'.++$pun_page['item_num'].'">'."\n\t\t\t\t".'<h3 class="legend"><span>'.sprintf($lang_admin['Extension loading error'], htmlspecialchars($entry)).'<span></h3>'."\n\t\t\t\t".'<p>'.$lang_admin['Failed parse manifest'].'</p>'."\n\t\t\t".'</div>';
+				++$num_failed;
+				continue;
+			}
+
+			// Validate manifest
+			$errors = validate_manifest($ext_data, $entry);
+			if (!empty($errors))
+			{
+				$pun_page['ext_error'][] = '<div class="ext-error databox db'.++$pun_page['item_num'].'">'."\n\t\t\t\t".'<h3 class="legend"><span>'.sprintf($lang_admin['Extension loading error'], htmlspecialchars($entry)).'</span></h3>'."\n\t\t\t\t".'<p>'.implode(' ', $errors).'</p>'."\n\t\t\t".'</div>';
+				++$num_failed;
+			}
+			else
+			{
+				if (!array_key_exists($entry, $inst_exts) || version_compare($inst_exts[$entry]['version'], $ext_data['extension']['version'], '!='))
+				{
+					$pun_page['ext_item'][] = '<div class="ext-item databox">'."\n\t\t\t".'<h3 class="legend"><span>'.htmlspecialchars($ext_data['extension']['title']).' v'.$ext_data['extension']['version'].'</span></h3>'."\n\t\t\t".'<p><span>'.sprintf($lang_admin['Extension by'], htmlspecialchars($ext_data['extension']['author'])).'</span>'.(($ext_data['extension']['description'] != '') ? '<br /><span>'.htmlspecialchars($ext_data['extension']['description']).'</span>' : '').'</p>'."\n\t\t\t".'<p class="actions"><a href="'.$base_url.'/admin/extensions.php?install='.urlencode($entry).'">'.$lang_admin['Install extension'].'</a></p>'."\n\t\t".'</div>';
+					++$num_exts;
+				}
+			}
+		}
+	}
+	$d->close();
+
+	($hook = get_hook('aex_section_install_pre_display_ext_list')) ? eval($hook) : null;
+
+	if ($num_exts)
+		echo "\t\t".implode("\n\t\t", $pun_page['ext_item'])."\n";
+	else
+	{
+
+?>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['No available extensions'] ?></p>
+		</div>
+<?php
+
+	}
+
+	// If any of the extensions had errors
+	if ($num_failed)
+	{
+
+?>
+		<div class="dataset">
+			<div class="ext-error databox db1">
+				<p class="important"><?php echo $lang_admin['Invalid extensions'] ?></p>
+			</div>
+			<?php echo implode("\n\t\t\t", $pun_page['ext_error'])."\n" ?>
+		</div>
+<?php
+
+	}
+
+?>
+	</div>
+
+</div>
+<?php
+
+	require PUN_ROOT.'footer.php';
+}
+else
+{
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		$lang_admin['Manage extensions']
+	);
+
+	($hook = get_hook('aex_section_manage_pre_header_load')) ? eval($hook) : null;
+
+	define('PUN_PAGE_SECTION', 'extensions');
+	define('PUN_PAGE', 'admin-extensions-manage');
+
+	require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Installed extensions'] ?></span></h2>
+		</div>
+<?php
+
+	if (!empty($inst_exts))
+	{
+
+?>
+		<div class="frm-info">
+			<p class="warn"><?php echo $lang_admin['Installed extensions warn'] ?></p>
+		</div>
+<?php
+
+		while (list($id, $ext) = @each($inst_exts))
+		{
+			$pun_page['ext_actions'] = array(
+				'<a href="'.$base_url.'/admin/extensions.php?section=manage&amp;flip='.$id.'&amp;csrf_token='.generate_form_token('flip'.$id).'">'.($ext['disabled'] != '1' ? $lang_admin['Disable'] : $lang_admin['Enable']).'</a>',
+				'<a href="'.$base_url.'/admin/extensions.php?section=manage&amp;uninstall='.$id.'">'.$lang_admin['Uninstall'].'</a>'
+			);
+
+			($hook = get_hook('aex_section_manage_pre_ext_actions')) ? eval($hook) : null;
+
+?>
+		<div class="ext-item databox<?php if ($ext['disabled'] == '1') echo ' extdisabled' ?>">
+			<h3 class="legend"><span><?php echo htmlspecialchars($ext['title']).((strpos($id, 'hotfix_') !== 0) ? ' v'.$ext['version'] : '') ?><?php if ($ext['disabled'] == '1') echo ' ( <span>'.$lang_admin['Extension disabled'].'</span> )' ?></span></h3>
+			<p><span><?php printf($lang_admin['Extension by'], $ext['author']) ?></span><?php if ($ext['description'] != ''): ?><br /><span><?php echo htmlspecialchars($ext['description']) ?></span><?php endif; ?></p>
+			<p class="actions"><?php echo implode('', $pun_page['ext_actions']) ?></p>
+		</div>
+<?php
+
+		}
+	}
+	else
+	{
+
+?>
+		<div class="frm-info">
+			<p><?php echo $lang_admin['No installed extensions'] ?></p>
+		</div>
+<?php
+
+	}
+
+?>
+	</div>
+
+</div>
+<?php
+
+	require PUN_ROOT.'footer.php';
+}
+
+($hook = get_hook('aex_end')) ? eval($hook) : null;

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/punbb/admin/forums.php	Sat Apr 05 23:56:45 2008 -0400
@@ -0,0 +1,726 @@
+<?php
+/***********************************************************************
+
+  Copyright (C) 2002-2008  PunBB.org
+
+  This file is part of PunBB.
+
+  PunBB 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.
+
+  PunBB 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 this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+  MA  02111-1307  USA
+
+************************************************************************/
+
+
+// if (!defined('PUN_ROOT'))
+// 	define('PUN_ROOT', '../');
+// require PUN_ROOT.'include/common.php';
+require PUN_ROOT.'include/common_admin.php';
+
+// import globals (I really hope this isn't dangerous)
+foreach ( $GLOBALS as $key => $_ )
+{
+  $$key =& $GLOBALS[$key];
+}
+
+($hook = get_hook('afo_start')) ? eval($hook) : null;
+
+if ($session->user_level < USER_LEVEL_ADMIN)
+	message($lang_common['No permission']);
+
+// Load the admin.php language file
+require PUN_ROOT.'lang/'.$pun_user['language'].'/admin.php';
+$GLOBALS['lang_admin'] = $lang_admin;
+
+
+// Add a "default" forum
+if (isset($_POST['add_forum']))
+{
+	$add_to_cat = intval($_POST['add_to_cat']);
+	if ($add_to_cat < 1)
+		message($lang_common['Bad request']);
+
+	$forum_name = trim($_POST['forum_name']);
+	$position = intval($_POST['position']);
+
+	($hook = get_hook('afo_add_forum_form_submitted')) ? eval($hook) : null;
+
+	if ($forum_name == '')
+		message($lang_admin['Must enter forum message']);
+
+	$query = array(
+		'INSERT'	=> 'forum_name, disp_position, cat_id',
+		'INTO'		=> 'forums',
+		'VALUES'	=> '\''.$pun_db->escape($forum_name).'\', '.$position.', '.$add_to_cat
+	);
+
+	($hook = get_hook('afo_qr_add_forum')) ? eval($hook) : null;
+	$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+	// Regenerate the quickjump cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_quickjump_cache();
+
+	pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Forum added'].' '.$lang_admin['Redirect']);
+}
+
+
+// Delete a forum
+else if (isset($_GET['del_forum']))
+{
+	$forum_to_delete = intval($_GET['del_forum']);
+	if ($forum_to_delete < 1)
+		message($lang_common['Bad request']);
+
+	// User pressed the cancel button
+	if (isset($_POST['del_forum_cancel']))
+		pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Cancel redirect']);
+
+	($hook = get_hook('afo_del_forum_form_submitted')) ? eval($hook) : null;
+
+	if (isset($_POST['del_forum_comply']))	// Delete a forum with all posts
+	{
+		@set_time_limit(0);
+
+		// Prune all posts and topics
+		prune($forum_to_delete, 1, -1);
+
+		delete_orphans();
+
+		// Delete the forum and any forum specific group permissions
+		$query = array(
+			'DELETE'	=> 'forums',
+			'WHERE'		=> 'id='.$forum_to_delete
+		);
+
+		($hook = get_hook('afo_qr_delete_forum')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		$query = array(
+			'DELETE'	=> 'forum_perms',
+			'WHERE'		=> 'forum_id='.$forum_to_delete
+		);
+
+		($hook = get_hook('afo_qr_delete_forum_perms')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		// Regenerate the quickjump cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_quickjump_cache();
+
+		pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Forum deleted'].' '.$lang_admin['Redirect']);
+	}
+	else	// If the user hasn't confirmed the delete
+	{
+		$query = array(
+			'SELECT'	=> 'f.forum_name',
+			'FROM'		=> 'forums AS f',
+			'WHERE'		=> 'f.id='.$forum_to_delete
+		);
+
+		($hook = get_hook('afo_qr_get_forum_name')) ? eval($hook) : null;
+		$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+		$forum_name = $pun_db->result($result);
+
+
+		// Setup breadcrumbs
+		$pun_page['crumbs'] = array(
+			array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+			array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+			array($lang_admin['Forums'], pun_link($pun_url['admin_forums'])),
+			$lang_admin['Delete forum']
+		);
+
+		($hook = get_hook('afo_del_forum_pre_header_load')) ? eval($hook) : null;
+
+		define('PUN_PAGE_SECTION', 'start');
+		define('PUN_PAGE', 'admin-forums');
+		require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php printf($lang_admin['Confirm delete forum'], htmlspecialchars($forum_name)) ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;del_forum=<?php echo $forum_id ?>">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&del_forum='.$forum_id) ?>" />
+			</div>
+			<div class="frm-info">
+				<p class="warn"><?php echo $lang_admin['Delete forum warning'] ?></p>
+			</div>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="del_forum_comply" value="<?php echo $lang_admin['Delete'] ?>" /></span>
+				<span class="cancel"><input type="submit" name="del_forum_cancel" value="<?php echo $lang_admin['Cancel'] ?>" /></span>
+			</div>
+		</form>
+	</div>
+
+</div>
+<?php
+
+		require PUN_ROOT.'footer.php';
+	}
+}
+
+
+// Update forum positions
+else if (isset($_POST['update_positions']))
+{
+	$positions = array_map('intval', $_POST['position']);
+
+	($hook = get_hook('afo_update_positions_form_submitted')) ? eval($hook) : null;
+
+	$query = array(
+		'SELECT'	=> 'f.id, f.disp_position',
+		'FROM'		=> 'categories AS c',
+		'JOINS'		=> array(
+			array(
+				'INNER JOIN'	=> 'forums AS f',
+				'ON'			=> 'c.id=f.cat_id'
+			)
+		),
+		'ORDER BY'	=> 'c.disp_position, c.id, f.disp_position'
+	);
+
+	($hook = get_hook('afo_qr_get_forums')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	while ($cur_forum = $pun_db->fetch_assoc($result))
+	{
+		// If these aren't set, we're looking at a forum that was added after
+		// the admin started editing: we don't want to mess with it
+		if (isset($positions[$cur_forum['id']]))
+		{
+			$new_disp_position = $positions[$cur_forum['id']];
+
+			if ($new_disp_position < 0)
+				message($lang_admin['Must be integer']);
+
+			// We only want to update if we changed the position
+			if ($cur_forum['disp_position'] != $new_disp_position)
+			{
+				$query = array(
+					'UPDATE'	=> 'forums',
+					'SET'		=> 'disp_position='.$new_disp_position,
+					'WHERE'		=> 'id='.$cur_forum['id']
+				);
+
+				($hook = get_hook('afo_qr_update_forum_position')) ? eval($hook) : null;
+				$pun_db->query_build($query) or error(__FILE__, __LINE__);
+			}
+		}
+	}
+
+	// Regenerate the quickjump cache
+	require_once PUN_ROOT.'include/cache.php';
+	generate_quickjump_cache();
+
+	pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Forums updated'].' '.$lang_admin['Redirect']);
+}
+
+
+else if (isset($_GET['edit_forum']))
+{
+	$forum_id = intval($_GET['edit_forum']);
+	if ($forum_id < 1)
+		message($lang_common['Bad request']);
+
+	// Update group permissions for $forum_id
+	if (isset($_POST['save']))
+	{
+		($hook = get_hook('afo_save_forum_form_submitted')) ? eval($hook) : null;
+
+		// Start with the forum details
+		$forum_name = trim($_POST['forum_name']);
+		$forum_desc = pun_linebreaks(trim($_POST['forum_desc']));
+		$cat_id = intval($_POST['cat_id']);
+		$sort_by = intval($_POST['sort_by']);
+		$redirect_url = isset($_POST['redirect_url']) ? trim($_POST['redirect_url']) : null;
+
+		if ($forum_name == '')
+			message($lang_admin['Must enter forum message']);
+
+		if ($cat_id < 1)
+			message($lang_common['Bad request']);
+
+		$forum_desc = ($forum_desc != '') ? '\''.$pun_db->escape($forum_desc).'\'' : 'NULL';
+		$redirect_url = ($redirect_url != '') ? '\''.$pun_db->escape($redirect_url).'\'' : 'NULL';
+
+		$query = array(
+			'UPDATE'	=> 'forums',
+			'SET'		=> 'forum_name=\''.$pun_db->escape($forum_name).'\', forum_desc='.$forum_desc.', redirect_url='.$redirect_url.', sort_by='.$sort_by.', cat_id='.$cat_id,
+			'WHERE'		=> 'id='.$forum_id
+		);
+
+		($hook = get_hook('afo_qr_update_forum')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		// Now let's deal with the permissions
+		if (isset($_POST['read_forum_old']))
+		{
+			$query = array(
+				'SELECT'	=> 'g.g_id, g.g_read_board, g.g_post_replies, g.g_post_topics',
+				'FROM'		=> 'groups AS g',
+				'WHERE'		=> 'g_id!='.PUN_ADMIN
+			);
+
+			($hook = get_hook('afo_qr_get_groups')) ? eval($hook) : null;
+			$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+			while ($cur_group = $pun_db->fetch_assoc($result))
+			{
+				$read_forum_new = ($cur_group['g_read_board'] == '1') ? isset($_POST['read_forum_new'][$cur_group['g_id']]) ? '1' : '0' : intval($_POST['read_forum_old'][$cur_group['g_id']]);
+				$post_replies_new = isset($_POST['post_replies_new'][$cur_group['g_id']]) ? '1' : '0';
+				$post_topics_new = isset($_POST['post_topics_new'][$cur_group['g_id']]) ? '1' : '0';
+
+				// Check if the new settings differ from the old
+				if ($read_forum_new != $_POST['read_forum_old'][$cur_group['g_id']] || $post_replies_new != $_POST['post_replies_old'][$cur_group['g_id']] || $post_topics_new != $_POST['post_topics_old'][$cur_group['g_id']])
+				{
+					// If the new settings are identical to the default settings for this group, delete its row in forum_perms
+					if ($read_forum_new == '1' && $post_replies_new == $cur_group['g_post_replies'] && $post_topics_new == $cur_group['g_post_topics'])
+					{
+						$query = array(
+							'DELETE'	=> 'forum_perms',
+							'WHERE'		=> 'group_id='.$cur_group['g_id'].' AND forum_id='.$forum_id
+						);
+
+						($hook = get_hook('afo_qr_delete_group_forum_perms')) ? eval($hook) : null;
+						$pun_db->query_build($query) or error(__FILE__, __LINE__);
+					}
+					else
+					{
+						// Run an UPDATE and see if it affected a row, if not, INSERT
+						$query = array(
+							'UPDATE'	=> 'forum_perms',
+							'SET'		=> 'read_forum='.$read_forum_new.', post_replies='.$post_replies_new.', post_topics='.$post_topics_new,
+							'WHERE'		=> 'group_id='.$cur_group['g_id'].' AND forum_id='.$forum_id
+						);
+
+						($hook = get_hook('afo_qr_update_forum_perms')) ? eval($hook) : null;
+						$pun_db->query_build($query) or error(__FILE__, __LINE__);
+						if (!$pun_db->affected_rows())
+						{
+							$query = array(
+								'INSERT'	=> 'group_id, forum_id, read_forum, post_replies, post_topics',
+								'INTO'		=> 'forum_perms',
+								'VALUES'	=> $cur_group['g_id'].', '.$forum_id.', '.$read_forum_new.', '.$post_replies_new.', '.$post_topics_new
+							);
+
+							($hook = get_hook('afo_qr_add_forum_perms')) ? eval($hook) : null;
+							$pun_db->query_build($query) or error(__FILE__, __LINE__);
+						}
+					}
+				}
+			}
+		}
+
+		// Regenerate the quickjump cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_quickjump_cache();
+
+		pun_redirect(pun_link($pun_url['admin_forums']), $lang_admin['Forum updated'].' '.$lang_admin['Redirect']);
+	}
+	else if (isset($_POST['revert_perms']))
+	{
+		($hook = get_hook('afo_revert_perms_form_submitted')) ? eval($hook) : null;
+
+		$query = array(
+			'DELETE'	=> 'forum_perms',
+			'WHERE'		=> 'forum_id='.$forum_id
+		);
+
+		($hook = get_hook('afo_qr_delete_forum_perms')) ? eval($hook) : null;
+		$pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+		// Regenerate the quickjump cache
+		require_once PUN_ROOT.'include/cache.php';
+		generate_quickjump_cache();
+
+		pun_redirect(pun_link($pun_url['admin_forums']).'&edit_forum='.$forum_id, $lang_admin['Permissions reverted'].' '.$lang_admin['Redirect']);
+	}
+
+	// Fetch forum info
+	$query = array(
+		'SELECT'	=> 'f.id, f.forum_name, f.forum_desc, f.redirect_url, f.num_topics, f.sort_by, f.cat_id',
+		'FROM'		=> 'forums AS f',
+		'WHERE'		=> 'id='.$forum_id
+	);
+
+	($hook = get_hook('afo_qr_get_forum_details')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	if (!$pun_db->num_rows($result))
+		message($lang_common['Bad request']);
+
+	$cur_forum = $pun_db->fetch_assoc($result);
+
+	$pun_page['form_info'] = array();
+	if ($cur_forum['redirect_url'])
+		$pun_page['form_info'][] = '<li><span>'.$lang_admin['Forum perms info 2'].'</span></li>';
+
+	$pun_page['form_info'][] = '<li><span>'.$lang_admin['Forum perms info 1'].'</span></li>';
+	$pun_page['form_info'][] = '<li><span>'.$lang_admin['Forum perms info 3'].'</span></li>';
+	$pun_page['form_info'][] = '<li><span>'. sprintf($lang_admin['Group key'], '<a href="'.pun_link($pun_url['admin_groups']).'">'.$lang_admin['User groups'].'</a>').'</span></li>';
+
+	// Setup the form
+	$pun_page['part_count'] = $pun_page['set_count'] = $pun_page['fld_count'] = 0;
+
+	// Setup breadcrumbs
+	$pun_page['crumbs'] = array(
+		array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+		array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+		array($lang_admin['Forums'], pun_link($pun_url['admin_forums'])),
+		$lang_admin['Edit forum']
+	);
+
+	($hook = get_hook('afo_edit_forum_pre_header_load')) ? eval($hook) : null;
+
+	define('PUN_PAGE_SECTION', 'start');
+	define('PUN_PAGE', 'admin-forums');
+	require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<form method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;edit_forum=<?php echo $forum_id ?>">
+
+	<div class="main-content frm parted">
+		<div class="hidden">
+			<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&edit_forum='.$forum_id) ?>" />
+		</div>
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Edit forum head'] ?></span></h2>
+		</div>
+		<div class="frm-form">
+<?php ($hook = get_hook('afo_edit_forum_pre_details_part')) ? eval($hook) : null; ?>
+			<div class="frm-part part<?php echo ++ $pun_page['part_count'] ?>">
+				<h3><span><?php printf($lang_admin['Edit details head'], $pun_page['part_count']) ?></span></h3>
+				<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+					<legend class="frm-legend"><strong><?php echo $lang_admin['Edit forum details legend'] ?></strong></legend>
+					<div class="frm-fld text">
+						<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+							<span class="fld-label"><?php echo $lang_admin['Forum name'] ?></span><br />
+							<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="forum_name" size="35" maxlength="80" value="<?php echo htmlspecialchars($cur_forum['forum_name']) ?>" /></span>
+						</label>
+					</div>
+					<div class="frm-fld text textarea">
+						<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+							<span class="fld-label"><?php echo $lang_admin['Forum description'] ?></span><br />
+							<span class="fld-input"><textarea id="fld<?php echo $pun_page['fld_count'] ?>" name="forum_desc" rows="3" cols="50"><?php echo htmlspecialchars($cur_forum['forum_desc']) ?></textarea></span>
+							<span class="fld-help"><?php echo $lang_admin['Forum description help'] ?></span>
+						</label>
+					</div>
+					<div class="frm-fld select">
+						<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+							<span class="fld-label"><?php echo $lang_admin['Category assignment'] ?></span><br />
+							<span class="fld-input"><select id="fld<?php echo $pun_page['fld_count'] ?>" name="cat_id">
+<?php
+
+	$query = array(
+		'SELECT'	=> 'c.id, c.cat_name',
+		'FROM'		=> 'categories AS c',
+		'ORDER BY'	=> 'c.disp_position'
+	);
+
+	($hook = get_hook('afo_qr_get_categories')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	while ($cur_cat = $pun_db->fetch_assoc($result))
+	{
+		$selected = ($cur_cat['id'] == $cur_forum['cat_id']) ? ' selected="selected"' : '';
+		echo "\t\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'"'.$selected.'>'.htmlspecialchars($cur_cat['cat_name']).'</option>'."\n";
+	}
+
+?>
+								</select></span>
+						</label>
+					</div>
+					<div class="frm-fld select">
+						<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+							<span class="fld-label"><?php echo $lang_admin['Sort topics by'] ?></span><br />
+							<span class="fld-input"><select id="fld<?php echo $pun_page['fld_count'] ?>" name="sort_by">
+									<option value="0"<?php if ($cur_forum['sort_by'] == '0') echo ' selected="selected"' ?>><?php echo $lang_admin['Sort last post'] ?></option>
+									<option value="1"<?php if ($cur_forum['sort_by'] == '1') echo ' selected="selected"' ?>><?php echo $lang_admin['Sort topic start'] ?></option>
+							</select></span>
+						</label>
+					</div>
+					<div class="frm-fld text">
+						<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+							<span class="fld-label"><?php echo $lang_admin['Redirect URL'] ?></span><br />
+							<span class="fld-input"><?php echo ($cur_forum['num_topics']) ? '<input type="text" id="fld'.$pun_page['fld_count'].'" name="redirect_url" size="45" maxlength="100" value="Only available in empty forums" disabled="disabled" />' : '<input type="text" id="fld'.$pun_page['fld_count'].'" name="redirect_url" size="45" maxlength="100" value="'.htmlspecialchars($cur_forum['redirect_url']).'" />'; ?></span>
+						</label>
+					</div>
+<?php ($hook = get_hook('afo_edit_forum_details_end')) ? eval($hook) : null; ?>
+				</fieldset>
+			</div>
+<?php
+
+// Reset fieldset counter
+$pun_page['set_count'] = 0;
+
+($hook = get_hook('afo_edit_forum_pre_permissions_part')) ? eval($hook) : null;
+
+?>
+			<div class="frm-part part<?php echo ++ $pun_page['part_count'] ?>">
+				<h3><span><?php printf($lang_admin['Edit permissions head'], $pun_page['part_count']) ?></span></h3>
+				<div class="frm-info">
+					<ul>
+						<?php echo implode("\n\t\t\t\t\t", $pun_page['form_info'])."\n" ?>
+					</ul>
+				</div>
+				<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+					<legend class="frm-legend"><strong><?php echo $lang_admin['Edit forum perms legend'] ?></strong></legend>
+<?php
+
+	$i = 2;
+
+	$query = array(
+		'SELECT'	=> 'g.g_id, g.g_title, g.g_read_board, g.g_post_replies, g.g_post_topics, fp.read_forum, fp.post_replies, fp.post_topics',
+		'FROM'		=> 'groups AS g',
+		'JOINS'		=> array(
+			array(
+				'LEFT JOIN'		=> 'forum_perms AS fp',
+				'ON'			=> 'g.g_id=fp.group_id AND fp.forum_id='.$forum_id
+			)
+		),
+		'WHERE'		=> 'g.g_id!='.PUN_ADMIN,
+		'ORDER BY'	=> 'g.g_id'
+	);
+
+	($hook = get_hook('afo_qr_get_forum_perms')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	while ($cur_perm = $pun_db->fetch_assoc($result))
+	{
+		$read_forum = ($cur_perm['read_forum'] != '0') ? true : false;
+		$post_replies = (($cur_perm['g_post_replies'] == '0' && $cur_perm['post_replies'] == '1') || ($cur_perm['g_post_replies'] == '1' && $cur_perm['post_replies'] != '0')) ? true : false;
+		$post_topics = (($cur_perm['g_post_topics'] == '0' && $cur_perm['post_topics'] == '1') || ($cur_perm['g_post_topics'] == '1' && $cur_perm['post_topics'] != '0')) ? true : false;
+
+		// Determine if the current sittings differ from the default or not
+		$read_forum_def = ($cur_perm['read_forum'] == '0') ? false : true;
+		$post_replies_def = (($post_replies && $cur_perm['g_post_replies'] == '0') || (!$post_replies && ($cur_perm['g_post_replies'] == '' || $cur_perm['g_post_replies'] == '1'))) ? false : true;
+		$post_topics_def = (($post_topics && $cur_perm['g_post_topics'] == '0') || (!$post_topics && ($cur_perm['g_post_topics'] == '' || $cur_perm['g_post_topics'] == '1'))) ? false : true;
+
+?>
+					<fieldset class="frm-group">
+						<legend><span><?php echo htmlspecialchars($cur_perm['g_title']) ?></span></legend>
+						<div class="radbox frm-choice">
+							<input type="hidden" name="read_forum_old[<?php echo $cur_perm['g_id'] ?>]" value="<?php echo ($read_forum) ? '1' : '0'; ?>" />
+							<label for="fld<?php echo ++$pun_page['fld_count'] ?>"<?php if (!$read_forum_def) echo ' class="warn"' ?>><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="read_forum_new[<?php echo $cur_perm['g_id'] ?>]" value="1"<?php if ($read_forum) echo ' checked="checked"'; echo ($cur_perm['g_read_board'] == '0') ? ' disabled="disabled"' : ''; ?> /> <?php echo $lang_admin['Read forum'] ?> <?php if (!$read_forum_def) echo $lang_admin['Not default']  ?></label>
+							<input type="hidden" name="post_replies_old[<?php echo $cur_perm['g_id'] ?>]" value="<?php echo ($post_replies) ? '1' : '0'; ?>" />
+							<label for="fld<?php echo ++$pun_page['fld_count'] ?>"<?php if (!$post_replies_def) echo ' class="warn"'; ?>><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="post_replies_new[<?php echo $cur_perm['g_id'] ?>]" value="1"<?php if ($post_replies) echo ' checked="checked"'; echo ($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : ''; ?> /> <?php echo $lang_admin['Post replies'] ?> <?php if (!$post_replies_def) echo $lang_admin['Not default'] ?></label>
+							<input type="hidden" name="post_topics_old[<?php echo $cur_perm['g_id'] ?>]" value="<?php echo ($post_topics) ? '1' : '0'; ?>" />
+							<label for="fld<?php echo ++$pun_page['fld_count'] ?>"<?php if (!$post_topics_def) echo ' class="warn"'; ?>><input type="checkbox" id="fld<?php echo $pun_page['fld_count'] ?>" name="post_topics_new[<?php echo $cur_perm['g_id'] ?>]" value="1"<?php if ($post_topics) echo ' checked="checked"'; echo ($cur_forum['redirect_url'] != '') ? ' disabled="disabled"' : ''; ?> /> <?php echo $lang_admin['Post topics'] ?> <?php if (!$post_topics_def) echo $lang_admin['Not default'] ?></label>
+<?php ($hook = get_hook('afo_edit_forum_new_permission')) ? eval($hook) : null; ?>
+						</div>
+					</fieldset>
+<?php
+
+		++$i;
+	}
+
+?>
+					<p class="frm-fld link"><span class="fld-label"><?php echo $lang_admin['Administrators'] ?></span> <span class="fld-input"><?php echo $lang_admin['Admin full perms'] ?></span></p>
+<?php ($hook = get_hook('afo_edit_forum_permissions_end')) ? eval($hook) : null; ?>
+				</fieldset>
+			</div>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" name="save" value="<?php echo $lang_admin['Save changes'] ?>" /></span>
+				<span class="submit"><input type="submit" name="revert_perms" value="<?php echo $lang_admin['Restore defaults'] ?>" /></span>
+			</div>
+		</div>
+	</div>
+	</form>
+
+</div>
+
+<?php
+
+	require PUN_ROOT.'footer.php';
+}
+
+// Setup the form
+$pun_page['fld_count'] = $pun_page['set_count'] = 0;
+
+// Setup breadcrumbs
+$pun_page['crumbs'] = array(
+	array($pun_config['o_board_title'], pun_link($pun_url['index'])),
+	array($lang_admin['Forum administration'], pun_link($pun_url['admin_index'])),
+	$lang_admin['Forums']
+);
+
+($hook = get_hook('afo_pre_header_load')) ? eval($hook) : null;
+
+define('PUN_PAGE_SECTION', 'start');
+define('PUN_PAGE', 'admin-forums');
+require PUN_ROOT.'header.php';
+
+?>
+<div id="pun-main" class="main sectioned admin">
+
+<?php echo generate_admin_menu(); ?>
+
+	<div class="main-head">
+		<h1><span>{ <?php echo end($pun_page['crumbs']) ?> }</span></h1>
+	</div>
+
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Add forum head'] ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;action=adddel">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&action=adddel') ?>" />
+			</div>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo $lang_admin['Add forum legend'] ?></strong></legend>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Forum name'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="forum_name" size="35" maxlength="80" /></span>
+					</label>
+				</div>
+				<div class="frm-fld text">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Position'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="position" size="3" maxlength="3" /></span>
+						<span class="fld-extra"><?php echo $lang_admin['Forum position help'] ?></span>
+					</label>
+				</div>
+				<div class="frm-fld select">
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>">
+						<span class="fld-label"><?php echo $lang_admin['Add to category'] ?></span><br />
+						<span class="fld-input"><select id="fld<?php echo $pun_page['fld_count'] ?>" name="add_to_cat">
+<?php
+
+	$query = array(
+		'SELECT'	=> 'c.id, c.cat_name',
+		'FROM'		=> 'categories AS c',
+		'ORDER BY'	=> 'c.disp_position'
+	);
+
+	($hook = get_hook('afo_qr_get_categories2')) ? eval($hook) : null;
+	$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+	while ($cur_cat = $pun_db->fetch_assoc($result))
+		echo "\t\t\t\t\t\t\t".'<option value="'.$cur_cat['id'].'">'.htmlspecialchars($cur_cat['cat_name']).'</option>'."\n";
+
+?>
+						</select></span>
+					</label>
+				</div>
+<?php ($hook = get_hook('afo_add_forum_fieldset_end')) ? eval($hook) : null; ?>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="add_forum" value=" <?php echo $lang_admin['Add forum'] ?> " /></span>
+			</div>
+		</form>
+	</div>
+
+<?php
+
+// Display all the categories and forums
+$query = array(
+	'SELECT'	=> 'c.id AS cid, c.cat_name, f.id AS fid, f.forum_name, f.disp_position',
+	'FROM'		=> 'categories AS c',
+	'JOINS'		=> array(
+		array(
+			'INNER JOIN'	=> 'forums AS f',
+			'ON'			=> 'c.id=f.cat_id'
+		)
+	),
+	'ORDER BY'	=> 'c.disp_position, c.id, f.disp_position'
+);
+
+($hook = get_hook('afo_qr_get_cats_and_forums')) ? eval($hook) : null;
+$result = $pun_db->query_build($query) or error(__FILE__, __LINE__);
+
+if ($pun_db->num_rows($result))
+{
+	// Reset fieldset counter
+	$pun_page['set_count'] = 0;
+
+?>
+	<div class="main-content frm">
+		<div class="frm-head">
+			<h2><span><?php echo $lang_admin['Edit forums head'] ?></span></h2>
+		</div>
+		<form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;action=edit">
+			<div class="hidden">
+				<input type="hidden" name="csrf_token" value="<?php echo generate_form_token(pun_link($pun_url['admin_forums']).'&action=edit') ?>" />
+			</div>
+
+<?php
+
+	$cur_category = 0;
+	$i = 2;
+
+	while ($cur_forum = $pun_db->fetch_assoc($result))
+	{
+		if ($cur_forum['cid'] != $cur_category)	// A new category since last iteration?
+		{
+			if ($i > 2) echo "\t\t\t".'</fieldset>'."\n";
+
+?>
+			<fieldset class="frm-set set<?php echo ++$pun_page['set_count'] ?>">
+				<legend class="frm-legend"><strong><?php echo htmlspecialchars($cur_forum['cat_name']) ?></strong></legend>
+				<h3 class="frm-fld link">
+					<span class="fld-label"><?php echo $lang_admin['Category'] ?></span>
+					<span class="fld-input">[ <?php echo htmlspecialchars($cur_forum['cat_name']) ?> ]</span>
+				</h3>
+<?php
+
+			$cur_category = $cur_forum['cid'];
+		}
+
+?>
+				<div class="frm-fld text twin">
+					<span class="fld-label"><a href="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;edit_forum=<?php echo $cur_forum['fid'] ?>"><span><?php echo $lang_admin['Edit'].'<span> '.htmlspecialchars($cur_forum['forum_name']).' </span></span>' ?></a><br /> <a href="<?php echo pun_link($pun_url['admin_forums']) ?>&amp;del_forum=<?php echo $cur_forum['fid'] ?>"><span><?php echo $lang_admin['Delete'].'<span> '.htmlspecialchars($cur_forum['forum_name']).'</span></span>' ?></a></span><br />
+					<label for="fld<?php echo ++$pun_page['fld_count'] ?>" class="twin2">
+						<span class="fld-label"><?php echo $lang_admin['Position'] ?></span><br />
+						<span class="fld-input"><input type="text" id="fld<?php echo $pun_page['fld_count'] ?>" name="position[<?php echo $cur_forum['fid'] ?>]" size="3" maxlength="3" value="<?php echo $cur_forum['disp_position'] ?>" /></span>
+						<small class="extra"><?php echo htmlspecialchars($cur_forum['forum_name']) ?></span>
+					</label>
+				</div>
+<?php
+
+		++$i;
+	}
+
+?>
+			</fieldset>
+			<div class="frm-buttons">
+				<span class="submit"><input type="submit" class="button" name="update_positions" value="<?php echo $lang_admin['Update positions'] ?>" /></span>
+			</div>
+		</form>
+<?php
+
+}
+
+?>
+	</div>
+
+</div>
+<?php
+
+require PUN_ROOT.'footer.php';