diff --git a/lib/punbb/admin_bans.php b/lib/punbb/admin_bans.php
index ce80d5fe23fcefdd11427a11ec1b07a89c0c8a99..2d5ad79261fb03284cad39b324dfd678ea891a26 100644
--- a/lib/punbb/admin_bans.php
+++ b/lib/punbb/admin_bans.php
@@ -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 --git a/lib/punbb/admin_categories.php b/lib/punbb/admin_categories.php
index 2c6e3dc16877bfddc4e3d02d8ec75de8f8d1294c..64962835ba632b32023c4fc5f9ab26fdaab1296a 100644
--- a/lib/punbb/admin_categories.php
+++ b/lib/punbb/admin_categories.php
@@ -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 --git a/lib/punbb/admin_censoring.php b/lib/punbb/admin_censoring.php
index cbfad3890995f7c67dcc688d2172b5d1060ff5b9..9cd1581a876c76bc93a6b96529b89cf5539d717d 100644
--- a/lib/punbb/admin_censoring.php
+++ b/lib/punbb/admin_censoring.php
@@ -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 --git a/lib/punbb/admin_forums.php b/lib/punbb/admin_forums.php
index b8dd7f7758c1e784d80ab5a3be2f4ff400c37d51..9581906810f40c1b03a460357045223e4e615056 100644
--- a/lib/punbb/admin_forums.php
+++ b/lib/punbb/admin_forums.php
@@ -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 --git a/lib/punbb/admin_groups.php b/lib/punbb/admin_groups.php
index 098b12397ae473e4e3efd2d56ed43b2284821e1e..687e67aab3b09c421143c83f121e0ceb1835b042 100644
--- a/lib/punbb/admin_groups.php
+++ b/lib/punbb/admin_groups.php
@@ -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 --git a/lib/punbb/admin_index.php b/lib/punbb/admin_index.php
index e3df4debdfe899f35aa9c2741fa387c2e73ed4e0..a720aecae1a3d11cf20c846c57228bf896f2269b 100644
--- a/lib/punbb/admin_index.php
+++ b/lib/punbb/admin_index.php
@@ -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 ($action == 'check_upgrade')
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 ($action == 'check_upgrade')
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 @@ generate_admin_menu('index');
<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 />
- © Copyright 2002, 2003, 2004, 2005 Rickard Andersson
+ © Copyright 2002-2008 PunBB
</dd>
<dt>Server load</dt>
<dd>
diff --git a/lib/punbb/admin_loader.php b/lib/punbb/admin_loader.php
index bc1d6219898db46fbf20d5d55567fbb03fa884a5..c5b638817b7743a582b221afb8db886699d064ec 100644
--- a/lib/punbb/admin_loader.php
+++ b/lib/punbb/admin_loader.php
@@ -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 --git a/lib/punbb/admin_maintenance.php b/lib/punbb/admin_maintenance.php
index adda7811232d2a3aeb478a57f3fcdd600c5ca3b5..06fd3923adace68c5ab39bcb0cdb3337c71ecceb 100644
--- a/lib/punbb/admin_maintenance.php
+++ b/lib/punbb/admin_maintenance.php
@@ -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 --git a/lib/punbb/admin_options.php b/lib/punbb/admin_options.php
index 7daa3ec8f7dbe66eb75f90dde1c4db1ab282a129..967c167301ae2a161282fde933cc66ff030f5dfe 100644
--- a/lib/punbb/admin_options.php
+++ b/lib/punbb/admin_options.php
@@ -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 --git a/lib/punbb/admin_permissions.php b/lib/punbb/admin_permissions.php
index 9fd5cdd49975b4205cd7919b561e8bf92c9d396d..f4bf263d788bc6cf23572bac22a18474bfbf5300 100644
--- a/lib/punbb/admin_permissions.php
+++ b/lib/punbb/admin_permissions.php
@@ -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 --git a/lib/punbb/admin_prune.php b/lib/punbb/admin_prune.php
index b38395416984d16c3a0e2bd10d5dd95efcefbb99..578b50149a11fd6e5fe96582ea1cc2060fd6e29f 100644
--- a/lib/punbb/admin_prune.php
+++ b/lib/punbb/admin_prune.php
@@ -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 --git a/lib/punbb/admin_ranks.php b/lib/punbb/admin_ranks.php
index eabdbebd70cfe84145a48447b682a38461e0233f..0608030b6ed73bdcfd714b4b7bec9427520aee83 100644
--- a/lib/punbb/admin_ranks.php
+++ b/lib/punbb/admin_ranks.php
@@ -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 --git a/lib/punbb/admin_reports.php b/lib/punbb/admin_reports.php
index 257b153d2bfc95b1e7d592dd4b0e59b8afbc4d3e..8a52b0107fccfe734567f8882586ca28aecaa666 100644
--- a/lib/punbb/admin_reports.php
+++ b/lib/punbb/admin_reports.php
@@ -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 --git a/lib/punbb/admin_users.php b/lib/punbb/admin_users.php
index ce74f9eed200280d4a31fd2005ce9c12ff6bdc92..41d4bb0e2bf29cadf1f77001ed29d860c91b77a0 100644
--- a/lib/punbb/admin_users.php
+++ b/lib/punbb/admin_users.php
@@ -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 --git a/lib/punbb/delete.php b/lib/punbb/delete.php
index ba46780a1ab47413f652b39ecb9162fd2f96eef8..8fb0b5d2e1376a32219a69348db3ee15db88bc3d 100644
--- a/lib/punbb/delete.php
+++ b/lib/punbb/delete.php
@@ -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 --git a/lib/punbb/edit.php b/lib/punbb/edit.php
index 59d683f3c6dfcb8b4a6653e1d5a3450047988100..943a29d7cc27af06609b1991f15c22f991ea7b59 100644
--- a/lib/punbb/edit.php
+++ b/lib/punbb/edit.php
@@ -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 --git a/lib/punbb/extern.php b/lib/punbb/extern.php
index 908dea22900f8d6c01e7e5ebcb92a44baa8901c7..88afe09c1de831426e7b54f9d39ad242e0ee9170 100644
--- a/lib/punbb/extern.php
+++ b/lib/punbb/extern.php
@@ -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 --git a/lib/punbb/footer.php b/lib/punbb/footer.php
index d1d8a52d1bfa65c1b632d7a9885c4e26c16535bd..c910a43ed1fd77edb026918c8278519cd408dcd5 100644
--- a/lib/punbb/footer.php
+++ b/lib/punbb/footer.php
@@ -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 @@ else if ($footer_style == 'viewforum' || $footer_style == 'viewtopic')
}
?>
- <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 />© Copyright 2002–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 />© Copyright 2002–2008 PunBB</p>
<?php
// Display debug info (if enabled/defined)
diff --git a/lib/punbb/header.php b/lib/punbb/header.php
index ff4bdcecf9f9407578014bbf853a63a209dc6768..cbeed3c03196d603232632fa56bdfcd4e91cca00 100644
--- a/lib/punbb/header.php
+++ b/lib/punbb/header.php
@@ -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 --git a/lib/punbb/help.php b/lib/punbb/help.php
index f97d13cc86f3142ce67bd396ad68f24ab5346c8e..19440aa2ac8e3183bb26cfd71007c09f23a54583 100644
--- a/lib/punbb/help.php
+++ b/lib/punbb/help.php
@@ -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 @@ require PUN_ROOT.'header.php';
[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 --git a/lib/punbb/include/cache.php b/lib/punbb/include/cache.php
index 12bb1c13659169167b79a689fb79b589d73df492..af6ae1edb97bf13438c6820b4c40944c05a5d006 100644
--- a/lib/punbb/include/cache.php
+++ b/lib/punbb/include/cache.php
@@ -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 --git a/lib/punbb/include/common.php b/lib/punbb/include/common.php
index 4669abc6115f6e227c1a4ba70fb296b490340a63..cb4916e9d6df2a0df2b5818953733760eff10d99 100644
--- a/lib/punbb/include/common.php
+++ b/lib/punbb/include/common.php
@@ -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 --git a/lib/punbb/include/common_admin.php b/lib/punbb/include/common_admin.php
index e5ca1d084c303a83faeae2a530beafed7bc4969c..b0aa02f656dcc69a3ebd2eb95158e156a765294c 100644
--- a/lib/punbb/include/common_admin.php
+++ b/lib/punbb/include/common_admin.php
@@ -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 --git a/lib/punbb/include/dblayer/common_db.php b/lib/punbb/include/dblayer/common_db.php
index 824f5f00fc0b22a16c1d6f78c78b89c12d8b1751..8dfd4bd5a2f2c1787fdbcba70659db4b8617b640 100644
--- a/lib/punbb/include/dblayer/common_db.php
+++ b/lib/punbb/include/dblayer/common_db.php
@@ -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 --git a/lib/punbb/include/dblayer/mysql.php b/lib/punbb/include/dblayer/mysql.php
index d375a6b1f502bf8412aef81e6982f6ee148d153d..3fa7013831f2931c89176af28aeb3526047cbf3f 100644
--- a/lib/punbb/include/dblayer/mysql.php
+++ b/lib/punbb/include/dblayer/mysql.php
@@ -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 --git a/lib/punbb/include/dblayer/mysqli.php b/lib/punbb/include/dblayer/mysqli.php
index 4ffe3d6b93b2c46cf5f8db40b2d4b4ebf16dbee4..6cb6d7d0a57dcfec21065792365a75147e91e9e0 100644
--- a/lib/punbb/include/dblayer/mysqli.php
+++ b/lib/punbb/include/dblayer/mysqli.php
@@ -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 --git a/lib/punbb/include/dblayer/pgsql.php b/lib/punbb/include/dblayer/pgsql.php
index 90783a2dac094ffff86621261fa8576960e574b8..5f94eec23510d1b9eb7260c875fec4ee5435ff44 100644
--- a/lib/punbb/include/dblayer/pgsql.php
+++ b/lib/punbb/include/dblayer/pgsql.php
@@ -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 --git a/lib/punbb/include/dblayer/sqlite.php b/lib/punbb/include/dblayer/sqlite.php
index 8912a70871803132e2815d90f5ceb2fc9a57e9c4..c82a9d31f5a444eeb4bcb2d12f4f70fbadf57484 100644
--- a/lib/punbb/include/dblayer/sqlite.php
+++ b/lib/punbb/include/dblayer/sqlite.php
@@ -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 --git a/lib/punbb/include/email.php b/lib/punbb/include/email.php
index a8586d70dea597f932bafa192042f436a0830e37..895bfa0f2bd60534de363e803d9bf297f5db6fe8 100644
--- a/lib/punbb/include/email.php
+++ b/lib/punbb/include/email.php
@@ -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 @@ function smtp_mail($to, $subject, $message, $headers = '')
$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 --git a/lib/punbb/include/functions.php b/lib/punbb/include/functions.php
index 56b28464d21028c2a6570c291a1d4c56d5b61f4a..ee04d1a80ab34de35addbf7ff81d554407884992 100644
--- a/lib/punbb/include/functions.php
+++ b/lib/punbb/include/functions.php
@@ -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 --git a/lib/punbb/include/parser.php b/lib/punbb/include/parser.php
index 901d8ae16b3f5899836700a16ed9062f0df13b01..74c50ea28ffba5d1c919ebc3d019df2e20ea2b0a 100644
--- a/lib/punbb/include/parser.php
+++ b/lib/punbb/include/parser.php
@@ -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 @@ function do_bbcode($text)
$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 --git a/lib/punbb/include/search_idx.php b/lib/punbb/include/search_idx.php
index 5b12cdaa460e083ab45b4207874d4da80c0d8493..9f9ad36c0c213e50c0e85894e6f9cfe2cb231f14 100644
--- a/lib/punbb/include/search_idx.php
+++ b/lib/punbb/include/search_idx.php
@@ -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 --git a/lib/punbb/index.php b/lib/punbb/index.php
index 053673e2cdfcdcef9bc5b30cb35a9fd8671c470e..d6b96b601b05473b99cf34728cd8fc0693b6e492 100644
--- a/lib/punbb/index.php
+++ b/lib/punbb/index.php
@@ -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 --git a/lib/punbb/install.php b/lib/punbb/install.php
index 33c477b53da39ce8e61feb350716e03e03898a6a..5adc6153514a08801e40c8247809697c44dac730 100644
--- a/lib/punbb/install.php
+++ b/lib/punbb/install.php
@@ -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.
@@ -27,7 +27,7 @@ pun_exit();
// The PunBB version this script installs
-$punbb_version = '1.2.17';
+$punbb_version = '1.2.19';
define('PUN_ROOT', './');
diff --git a/lib/punbb/lang/English/index.php b/lib/punbb/lang/English/index.php
index d2abbff110a57c078601c359176a337379e9ff6b..517c1127f268b2237708520cc37d7e3a8ac5ca78 100644
--- a/lib/punbb/lang/English/index.php
+++ b/lib/punbb/lang/English/index.php
@@ -5,7 +5,7 @@ $lang_index = array(
'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 --git a/lib/punbb/login.php b/lib/punbb/login.php
index 7257dbb2c5b0cbba4f80d3aa6b9cc5db3b828283..6035d23e06816470c487ea156981b0e6862f7b12 100644
--- a/lib/punbb/login.php
+++ b/lib/punbb/login.php
@@ -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 --git a/lib/punbb/misc.php b/lib/punbb/misc.php
index 637ea6a887812bbf45e0b69c48a909d857a7bc0e..0ae9de3733e7e1fda5ddb3fd21275bfc7ce69f16 100644
--- a/lib/punbb/misc.php
+++ b/lib/punbb/misc.php
@@ -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 --git a/lib/punbb/moderate.php b/lib/punbb/moderate.php
index 780d5076bd3fa5851ab86c663469da80b79a311f..2a367f8dbb5fbefa56be3f8a7fc9130fd60f0978 100644
--- a/lib/punbb/moderate.php
+++ b/lib/punbb/moderate.php
@@ -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 @@ if (isset($_GET['tid']))
<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 (isset($_REQUEST['move_topics']) || isset($_POST['move_topics_to']))
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 @@ if (isset($_REQUEST['delete_topics']) || isset($_POST['delete_topics_comply']))
<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 --git a/lib/punbb/plugins/AMP_Example.php b/lib/punbb/plugins/AMP_Example.php
index 670cf57e6b7e2f435e4b13ea80459a319e68f2df..4b9656115853bb39f89b8beb6ff943c2ee327a36 100644
--- a/lib/punbb/plugins/AMP_Example.php
+++ b/lib/punbb/plugins/AMP_Example.php
@@ -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 --git a/lib/punbb/post.php b/lib/punbb/post.php
index 2dee57a98540547b1b26c099fe932c30c766ddf7..6063202c4a893468a099be4c8197ff596935c4db 100644
--- a/lib/punbb/post.php
+++ b/lib/punbb/post.php
@@ -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 --git a/lib/punbb/profile.php b/lib/punbb/profile.php
index 3e8c5686d7894bb478ca6ddaa0dddcc0653af914..8f6fda4c4365c21073c1b33cf71d0d7cc12b6613 100644
--- a/lib/punbb/profile.php
+++ b/lib/punbb/profile.php
@@ -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 @@ else if (isset($_POST['delete_user']) || isset($_POST['delete_user_comply']))
// 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 --git a/lib/punbb/register.php b/lib/punbb/register.php
index 82fa300a30390d49714698965db65f0c4b409e41..9ed7360cf50c6b0ddbdc6aba5da6074fec9ca522 100644
--- a/lib/punbb/register.php
+++ b/lib/punbb/register.php
@@ -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 --git a/lib/punbb/search.php b/lib/punbb/search.php
index 82385b168849221f69c08fc8e95dd52d19335f7b..01ec2e2db43b8acd94cf8c7bcf73603fd02d7ea3 100644
--- a/lib/punbb/search.php
+++ b/lib/punbb/search.php
@@ -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 --git a/lib/punbb/userlist.php b/lib/punbb/userlist.php
index 37e43597073fc71bd55b8de9939cb8298a1f60b1..ad56a0749964a4ffd226efa9331726a63b620a3b 100644
--- a/lib/punbb/userlist.php
+++ b/lib/punbb/userlist.php
@@ -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 @@ $paging_links = $lang_common['Pages'].': '.paginate($num_pages, $p, 'userlist.ph
<?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 --git a/lib/punbb/viewforum.php b/lib/punbb/viewforum.php
index eb8fe344ecff3b112ef17f4cdf8ddd83bd793a9d..6e3f3e733448bbf454ebe92a6337f7d858367814 100644
--- a/lib/punbb/viewforum.php
+++ b/lib/punbb/viewforum.php
@@ -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 --git a/lib/punbb/viewtopic.php b/lib/punbb/viewtopic.php
index e9944a43914c65af57fc7bcf3192fe7488c0f90a..5f1c3c986cf73c4ec2ef009afe78068167378468 100644
--- a/lib/punbb/viewtopic.php
+++ b/lib/punbb/viewtopic.php
@@ -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.