diff -urN punbb-1.2.17/upload/admin_bans.php punbb-1.2.19/upload/admin_bans.php
--- punbb-1.2.17/upload/admin_bans.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_bans.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_categories.php punbb-1.2.19/upload/admin_categories.php
--- punbb-1.2.17/upload/admin_categories.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_categories.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_censoring.php punbb-1.2.19/upload/admin_censoring.php
--- punbb-1.2.17/upload/admin_censoring.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_censoring.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_forums.php punbb-1.2.19/upload/admin_forums.php
--- punbb-1.2.17/upload/admin_forums.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_forums.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_groups.php punbb-1.2.19/upload/admin_groups.php
--- punbb-1.2.17/upload/admin_groups.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_groups.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_index.php punbb-1.2.19/upload/admin_index.php
--- punbb-1.2.17/upload/admin_index.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_index.php	2008-07-11 04:43:23.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
@@ -43,7 +43,7 @@
 	if (!ini_get('allow_url_fopen'))
 		message('Unable to check for upgrade since \'allow_url_fopen\' is disabled on this system.');
 
-	$fp = @fopen('http://www.punbb.org/latest_version', 'r');
+	$fp = @fopen('http://punbb.informer.com/latest_version', 'r');
 	$latest_version = trim(@fread($fp, 16));
 	@fclose($fp);
 
@@ -59,7 +59,7 @@
 	if ($cur_version >= $latest_version)
 		message('You are running the latest version of PunBB.');
 	else
-		message('A new version of PunBB has been released. You can download the latest version at <a href="http://www.punbb.org/">PunBB.org</a>.');
+		message('A new version of PunBB has been released. You can download the latest version at <a href="http://punbb.informer.com/">PunBB.Informer.Com</a>.');
 }
 
 
@@ -176,7 +176,7 @@
 					<dt>PunBB version</dt>
 					<dd>
 						PunBB <?php echo $pun_config['o_cur_version'] ?> - <a href="admin_index.php?action=check_upgrade">Check for upgrade</a><br />
-						&copy; Copyright 2002, 2003, 2004, 2005 Rickard Andersson
+						&copy; Copyright 2002-2008 PunBB
 					</dd>
 					<dt>Server load</dt>
 					<dd>
diff -urN punbb-1.2.17/upload/admin_loader.php punbb-1.2.19/upload/admin_loader.php
--- punbb-1.2.17/upload/admin_loader.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_loader.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_maintenance.php punbb-1.2.19/upload/admin_maintenance.php
--- punbb-1.2.17/upload/admin_maintenance.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_maintenance.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_options.php punbb-1.2.19/upload/admin_options.php
--- punbb-1.2.17/upload/admin_options.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_options.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_permissions.php punbb-1.2.19/upload/admin_permissions.php
--- punbb-1.2.17/upload/admin_permissions.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_permissions.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_prune.php punbb-1.2.19/upload/admin_prune.php
--- punbb-1.2.17/upload/admin_prune.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_prune.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_ranks.php punbb-1.2.19/upload/admin_ranks.php
--- punbb-1.2.17/upload/admin_ranks.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_ranks.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_reports.php punbb-1.2.19/upload/admin_reports.php
--- punbb-1.2.17/upload/admin_reports.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_reports.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/admin_users.php punbb-1.2.19/upload/admin_users.php
--- punbb-1.2.17/upload/admin_users.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/admin_users.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/delete.php punbb-1.2.19/upload/delete.php
--- punbb-1.2.17/upload/delete.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/delete.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/edit.php punbb-1.2.19/upload/edit.php
--- punbb-1.2.17/upload/edit.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/edit.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/extern.php punbb-1.2.19/upload/extern.php
--- punbb-1.2.17/upload/extern.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/extern.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/footer.php punbb-1.2.19/upload/footer.php
--- punbb-1.2.17/upload/footer.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/footer.php	2008-07-11 04:43:23.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
@@ -106,7 +106,7 @@
 }
 
 ?>
-			<p class="conr">Powered by <a href="http://www.punbb.org/">PunBB</a><?php if ($pun_config['o_show_version'] == '1') echo ' '.$pun_config['o_cur_version']; ?><br />&copy; Copyright 2002&#8211;2005 Rickard Andersson</p>
+			<p class="conr">Powered by <a href="http://punbb.informer.com/">PunBB</a><?php if ($pun_config['o_show_version'] == '1') echo ' '.$pun_config['o_cur_version']; ?><br />&copy; Copyright 2002&#8211;2008 PunBB</p>
 <?php
 
 // Display debug info (if enabled/defined)
diff -urN punbb-1.2.17/upload/header.php punbb-1.2.19/upload/header.php
--- punbb-1.2.17/upload/header.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/header.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/help.php punbb-1.2.19/upload/help.php
--- punbb-1.2.17/upload/help.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/help.php	2008-07-11 04:43:23.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
@@ -70,7 +70,7 @@
 		[email=myname@mydomain.com]<?php echo $lang_help['My e-mail address'] ?>[/email] <?php echo $lang_help['produces'] ?> <a href="mailto:myname@mydomain.com"><?php echo $lang_help['My e-mail address'] ?></a><br /><br />
 	</div>
 	<p><a name="img"></a><?php echo $lang_help['Images info'] ?></p>
-	<div>[img]http://www.punbb.org/img/small_logo.png[/img] <?php echo $lang_help['produces'] ?> <img src="http://www.punbb.org/img/small_logo.png" alt="http://www.punbb.org/img/small_logo.png" /></div>
+	<div>[img]http://punbb.informer.com/img/small_logo.png[/img] <?php echo $lang_help['produces'] ?> <img src="http://punbb.informer.com/img/small_logo.png" alt="http://punbb.informer.com/img/small_logo.png" /></div>
 </div>
 <h2><?php echo $lang_help['Quotes'] ?></h2>
 <div class="box">
diff -urN punbb-1.2.17/upload/include/cache.php punbb-1.2.19/upload/include/cache.php
--- punbb-1.2.17/upload/include/cache.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/cache.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/common.php punbb-1.2.19/upload/include/common.php
--- punbb-1.2.17/upload/include/common.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/common.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/common_admin.php punbb-1.2.19/upload/include/common_admin.php
--- punbb-1.2.17/upload/include/common_admin.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/common_admin.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/dblayer/common_db.php punbb-1.2.19/upload/include/dblayer/common_db.php
--- punbb-1.2.17/upload/include/dblayer/common_db.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/dblayer/common_db.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/dblayer/mysql.php punbb-1.2.19/upload/include/dblayer/mysql.php
--- punbb-1.2.17/upload/include/dblayer/mysql.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/dblayer/mysql.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/dblayer/mysqli.php punbb-1.2.19/upload/include/dblayer/mysqli.php
--- punbb-1.2.17/upload/include/dblayer/mysqli.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/dblayer/mysqli.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/dblayer/pgsql.php punbb-1.2.19/upload/include/dblayer/pgsql.php
--- punbb-1.2.17/upload/include/dblayer/pgsql.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/dblayer/pgsql.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/dblayer/sqlite.php punbb-1.2.19/upload/include/dblayer/sqlite.php
--- punbb-1.2.17/upload/include/dblayer/sqlite.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/dblayer/sqlite.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/email.php punbb-1.2.19/upload/include/email.php
--- punbb-1.2.17/upload/include/email.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/email.php	2008-07-11 02:26:07.000000000 -0700
@@ -1,7 +1,9 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
+
+  Partially based on code copyright (C) 2008  FluxBB.org
 
   This file is part of PunBB.
 
@@ -123,6 +125,10 @@
 
 	$recipients = explode(',', $to);
 
+	// Sanitize the message
+	$message = str_replace("\r\n.", "\r\n..", $message);
+	$message = (substr($message, 0, 1) == '.' ? '.'.$message : $message);
+
 	// Are we using port 25 or a custom port?
 	if (strpos($pun_config['o_smtp_host'], ':') !== false)
 		list($smtp_host, $smtp_port) = explode(':', $pun_config['o_smtp_host']);
diff -urN punbb-1.2.17/upload/include/functions.php punbb-1.2.19/upload/include/functions.php
--- punbb-1.2.17/upload/include/functions.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/functions.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/include/parser.php punbb-1.2.19/upload/include/parser.php
--- punbb-1.2.17/upload/include/parser.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/parser.php	2008-07-14 01:48:51.000000000 -0700
@@ -1,7 +1,9 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
+
+  Partially based on code copyright (C) 2008  FluxBB.org
 
   This file is part of PunBB.
 
@@ -314,10 +316,10 @@
 	$pattern = array('#\[b\](.*?)\[/b\]#s',
 					 '#\[i\](.*?)\[/i\]#s',
 					 '#\[u\](.*?)\[/u\]#s',
-					 '#\[url\]([^\[]*?)\[/url\]#e',
-					 '#\[url=([^\[]*?)\](.*?)\[/url\]#e',
-					 '#\[email\]([^\[]*?)\[/email\]#',
-					 '#\[email=([^\[]*?)\](.*?)\[/email\]#',
+					 '#\[url\]([^\[<]*?)\[/url\]#e',
+					 '#\[url=([^\[<]*?)\](.*?)\[/url\]#e',
+					 '#\[email\]([^\[<]*?)\[/email\]#',
+					 '#\[email=([^\[<]*?)\](.*?)\[/email\]#',
 					 '#\[color=([a-zA-Z]*|\#?[0-9a-fA-F]{6})](.*?)\[/color\]#s');
 
 	$replace = array('<strong>$1</strong>',
diff -urN punbb-1.2.17/upload/include/search_idx.php punbb-1.2.19/upload/include/search_idx.php
--- punbb-1.2.17/upload/include/search_idx.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/include/search_idx.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/index.php punbb-1.2.19/upload/index.php
--- punbb-1.2.17/upload/index.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/index.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/install.php punbb-1.2.19/upload/install.php
--- punbb-1.2.17/upload/install.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/install.php	2008-07-14 04:03:48.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
@@ -24,7 +24,7 @@
 
 
 // The PunBB version this script installs
-$punbb_version = '1.2.17';
+$punbb_version = '1.2.19';
 
 
 define('PUN_ROOT', './');
diff -urN punbb-1.2.17/upload/lang/English/index.php punbb-1.2.19/upload/lang/English/index.php
--- punbb-1.2.17/upload/lang/English/index.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/lang/English/index.php	2008-07-11 04:43:23.000000000 -0700
@@ -5,7 +5,7 @@
 
 'Topics'				=>  'Topics',
 'Moderators'			=>  'Moderators',
-'Link to'				=>	'Link to',	// As in "Link to http://www.punbb.org/"
+'Link to'				=>	'Link to',	// As in "Link to http://punbb.informer.com/"
 'Empty board'			=>	'Board is empty.',
 'Newest user'			=>	'Newest registered user',
 'Users online'			=>	'Registered users online',
diff -urN punbb-1.2.17/upload/login.php punbb-1.2.19/upload/login.php
--- punbb-1.2.17/upload/login.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/login.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/misc.php punbb-1.2.19/upload/misc.php
--- punbb-1.2.17/upload/misc.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/misc.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/moderate.php punbb-1.2.19/upload/moderate.php
--- punbb-1.2.17/upload/moderate.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/moderate.php	2008-07-11 02:26:07.000000000 -0700
@@ -1,7 +1,9 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
+
+  Partially based on code copyright (C) 2008  FluxBB.org
 
   This file is part of PunBB.
 
@@ -141,7 +143,7 @@
 				<fieldset>
 					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
 					<div class="infldset">
-						<input type="hidden" name="posts" value="<?php echo implode(',', array_keys($posts)) ?>" />
+						<input type="hidden" name="posts" value="<?php echo implode(',', array_map('intval', array_keys($posts))) ?>" />
 						<p><?php echo $lang_misc['Delete posts comply'] ?></p>
 					</div>
 				</fieldset>
@@ -334,7 +336,7 @@
 		if (empty($topics))
 			message($lang_misc['No topics selected']);
 
-		$topics = implode(',', array_keys($topics));
+		$topics = implode(',', array_map('intval', array_keys($topics)));
 		$action = 'multi';
 	}
 	else
@@ -457,7 +459,7 @@
 	<h2><?php echo $lang_misc['Delete topics'] ?></h2>
 	<div class="box">
 		<form method="post" action="moderate.php?fid=<?php echo $fid ?>">
-			<input type="hidden" name="topics" value="<?php echo implode(',', array_keys($topics)) ?>" />
+			<input type="hidden" name="topics" value="<?php echo implode(',', array_map('intval', array_keys($topics))) ?>" />
 			<div class="inform">
 				<fieldset>
 					<legend><?php echo $lang_misc['Confirm delete legend'] ?></legend>
diff -urN punbb-1.2.17/upload/plugins/AMP_Example.php punbb-1.2.19/upload/plugins/AMP_Example.php
--- punbb-1.2.17/upload/plugins/AMP_Example.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/plugins/AMP_Example.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/post.php punbb-1.2.19/upload/post.php
--- punbb-1.2.17/upload/post.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/post.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/profile.php punbb-1.2.19/upload/profile.php
--- punbb-1.2.17/upload/profile.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/profile.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
@@ -603,6 +603,14 @@
 		// Delete the user
 		$db->query('DELETE FROM '.$db->prefix.'users WHERE id='.$id) or error('Unable to delete user', __FILE__, __LINE__, $db->error());
 
+		// Delete user avatar
+		if (file_exists($pun_config['o_avatars_dir'].'/'.$id.'.gif'))
+			@unlink($pun_config['o_avatars_dir'].'/'.$id.'.gif');
+		if (file_exists($pun_config['o_avatars_dir'].'/'.$id.'.jpg'))
+			@unlink($pun_config['o_avatars_dir'].'/'.$id.'.jpg');
+		if (file_exists($pun_config['o_avatars_dir'].'/'.$id.'.png'))
+			@unlink($pun_config['o_avatars_dir'].'/'.$id.'.png');
+
 		redirect('index.php', $lang_profile['User delete redirect']);
 	}
 
diff -urN punbb-1.2.17/upload/register.php punbb-1.2.19/upload/register.php
--- punbb-1.2.17/upload/register.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/register.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/search.php punbb-1.2.19/upload/search.php
--- punbb-1.2.17/upload/search.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/search.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/userlist.php punbb-1.2.19/upload/userlist.php
--- punbb-1.2.17/upload/userlist.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/userlist.php	2008-07-11 02:26:07.000000000 -0700
@@ -1,7 +1,9 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
+
+  Partially based on code copyright (C) 2008  FluxBB.org
 
   This file is part of PunBB.
 
@@ -154,7 +156,7 @@
 <?php
 
 // Grab the users
-$result = $db->query('SELECT u.id, u.username, u.title, u.num_posts, u.registered, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id>1'.(!empty($where_sql) ? ' AND '.implode(' AND ', $where_sql) : '').' ORDER BY '.$sort_by.' '.$sort_dir.' LIMIT '.$start_from.', 50') or error('Unable to fetch user list', __FILE__, __LINE__, $db->error());
+$result = $db->query('SELECT u.id, u.username, u.title, u.num_posts, u.registered, g.g_id, g.g_user_title FROM '.$db->prefix.'users AS u LEFT JOIN '.$db->prefix.'groups AS g ON g.g_id=u.group_id WHERE u.id>1'.(!empty($where_sql) ? ' AND '.implode(' AND ', $where_sql) : '').' ORDER BY '.$sort_by.' '.$sort_dir.', u.id ASC LIMIT '.$start_from.', 50') or error('Unable to fetch user list', __FILE__, __LINE__, $db->error());
 if ($db->num_rows($result))
 {
 	while ($user_data = $db->fetch_assoc($result))
diff -urN punbb-1.2.17/upload/viewforum.php punbb-1.2.19/upload/viewforum.php
--- punbb-1.2.17/upload/viewforum.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/viewforum.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
diff -urN punbb-1.2.17/upload/viewtopic.php punbb-1.2.19/upload/viewtopic.php
--- punbb-1.2.17/upload/viewtopic.php	2008-06-26 05:25:42.000000000 -0700
+++ punbb-1.2.19/upload/viewtopic.php	2008-07-11 02:14:40.000000000 -0700
@@ -1,7 +1,7 @@
 <?php
 /***********************************************************************
 
-  Copyright (C) 2002-2005  Rickard Andersson (rickard@punbb.org)
+  Copyright (C) 2002-2008  PunBB
 
   This file is part of PunBB.
 
