', $text);
- $text = preg_replace('#\[quote=("|"|\'|)(.*)\\1\]#seU', '"
".str_replace(\'[\', \'[\', \'$2\')." ".$lang_common[\'wrote\'].":
"', $text);
- $text = preg_replace('#\[\/quote\]\s*#', '
', $text);
- }
return $text;
}
diff -urN punbb-1.2.4/upload/include/search_idx.php punbb-1.2.11/upload/include/search_idx.php
--- punbb-1.2.4/upload/include/search_idx.php Sun Jan 30 12:58:04 2005
+++ punbb-1.2.11/upload/include/search_idx.php Mon Oct 31 22:37:18 2005
@@ -43,8 +43,8 @@
if (empty($noise_match))
{
- $noise_match = array('quote', 'code', 'url', 'img', 'email', 'color', 'colour', '^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '~', '+', '[', ']', '{', '}', ':', '\\', '/', '=', '#', ';', '!', '*');
- $noise_replace = array('', '', '', '', '', '', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '' , ' ', ' ', ' ', ' ', ' ', ' ');
+ $noise_match = array('[quote', '[code', '[url', '[img', '[email', '[color', '[colour', 'quote]', 'code]', 'url]', 'img]', 'email]', 'color]', 'colour]', '^', '$', '&', '(', ')', '<', '>', '`', '\'', '"', '|', ',', '@', '_', '?', '%', '~', '+', '[', ']', '{', '}', ':', '\\', '/', '=', '#', ';', '!', '*');
+ $noise_replace = array('', '', '', '', '', '', '', '', '', '', '', '', '', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '', '', ' ', ' ', ' ', ' ', '', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', '' , ' ', ' ', ' ', ' ', ' ', ' ');
$stopwords = (array)@file(PUN_ROOT.'lang/'.$pun_user['language'].'/stopwords.txt');
$stopwords = array_map('trim', $stopwords);
@@ -69,10 +69,8 @@
{
while (list($i, $word) = @each($words))
{
+ $words[$i] = trim($word, '.');
$num_chars = pun_strlen($word);
-
- if (strrpos($word, '.') == ($num_chars-1))
- $words[$i] = substr($word, 0, -1);
if ($num_chars < 3 || $num_chars > 20 || in_array($word, $stopwords))
unset($words[$i]);
diff -urN punbb-1.2.4/upload/install.php punbb-1.2.11/upload/install.php
--- punbb-1.2.4/upload/install.php Fri Mar 18 23:12:42 2005
+++ punbb-1.2.11/upload/install.php Tue Feb 28 19:23:46 2006
@@ -24,7 +24,7 @@
// The PunBB version this script installs
-$punbb_version = '1.2.4';
+$punbb_version = '1.2.11';
define('PUN_ROOT', './');
@@ -165,7 +165,7 @@
@@ -324,7 +324,7 @@
if (preg_match('#\[b\]|\[/b\]|\[u\]|\[/u\]|\[i\]|\[/i\]|\[color|\[/color\]|\[quote\]|\[/quote\]|\[code\]|\[/code\]|\[img\]|\[/img\]|\[url|\[/url\]|\[email|\[/email\]#i', $username))
error('Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please go back and correct.');
- if (!preg_match('/^[_a-z0-9-]+(\.[_a-z0-9-]+)*@[a-z0-9-]+(\.[a-z0-9-]+)*(\.[a-z]{2,4})$/', $email))
+ if (strlen($email) > 50 || !preg_match('/^(([^<>()[\]\\.,;:\s@"\']+(\.[^<>()[\]\\.,;:\s@"\']+)*)|("[^"\']+"))@((\[\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\])|(([a-zA-Z\d\-]+\.)+[a-zA-Z]{2,}))$/', $email))
error('The administrator e-mail address you entered is invalid. Please go back and correct.');
@@ -346,6 +346,9 @@
case 'sqlite':
require PUN_ROOT.'include/dblayer/sqlite.php';
break;
+
+ default:
+ error('\''.$db_type.'\' is not a valid database type.');
}
// Create the database object (and connect/select db)
@@ -525,7 +528,7 @@
break;
}
- $db->query($sql) or error('Unable to create table '.$db_prefix.'online. Please check your settings and try again.', __FILE__, __LINE__, $db->error());
+ $db->query($sql) or error('Unable to create table '.$db_prefix.'config. Please check your settings and try again.', __FILE__, __LINE__, $db->error());
@@ -1420,7 +1423,7 @@