', $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.17/upload/include/search_idx.php
--- punbb-1.2.4/upload/include/search_idx.php 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/search_idx.php 2005-10-31 22:37:19.000000000 +0100
@@ -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,11 +69,9 @@
{
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/include/template/admin.tpl punbb-1.2.17/upload/include/template/admin.tpl
--- punbb-1.2.4/upload/include/template/admin.tpl 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/template/admin.tpl 2007-04-08 19:30:39.000000000 +0200
@@ -1,6 +1,6 @@
-
+
diff -urN punbb-1.2.4/upload/include/template/help.tpl punbb-1.2.17/upload/include/template/help.tpl
--- punbb-1.2.4/upload/include/template/help.tpl 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/template/help.tpl 2007-04-08 19:30:39.000000000 +0200
@@ -1,6 +1,6 @@
-
+
diff -urN punbb-1.2.4/upload/include/template/main.tpl punbb-1.2.17/upload/include/template/main.tpl
--- punbb-1.2.4/upload/include/template/main.tpl 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/template/main.tpl 2007-04-08 19:30:39.000000000 +0200
@@ -1,6 +1,6 @@
-
+
diff -urN punbb-1.2.4/upload/include/template/maintenance.tpl punbb-1.2.17/upload/include/template/maintenance.tpl
--- punbb-1.2.4/upload/include/template/maintenance.tpl 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/template/maintenance.tpl 2007-04-08 19:30:39.000000000 +0200
@@ -1,6 +1,6 @@
-
+
diff -urN punbb-1.2.4/upload/include/template/redirect.tpl punbb-1.2.17/upload/include/template/redirect.tpl
--- punbb-1.2.4/upload/include/template/redirect.tpl 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/include/template/redirect.tpl 2007-04-08 19:30:39.000000000 +0200
@@ -1,6 +1,6 @@
-
+
diff -urN punbb-1.2.4/upload/install.php punbb-1.2.17/upload/install.php
--- punbb-1.2.4/upload/install.php 2005-03-18 23:15:15.000000000 +0100
+++ punbb-1.2.17/upload/install.php 2008-02-20 00:22:17.000000000 +0100
@@ -24,7 +24,7 @@
// The PunBB version this script installs
-$punbb_version = '1.2.4';
+$punbb_version = '1.2.17';
define('PUN_ROOT', './');
@@ -165,7 +165,7 @@
Enter then name of your database
-
The name of the database that PunBB will be installed into. The database must exist. For SQLite, this is the relative path to the database file. If it doesn't exists, PunBB will attempt to create it.
+
The name of the database that PunBB will be installed into. The database must exist. For SQLite, this is the relative path to the database file. If the SQLite database file does not exist, PunBB will attempt to create it.
Database name
@@ -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());
@@ -754,7 +757,7 @@
poster_id INT(10) UNSIGNED NOT NULL DEFAULT 1,
poster_ip VARCHAR(15),
poster_email VARCHAR(50),
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
hide_smilies TINYINT(1) NOT NULL DEFAULT 0,
posted INT(10) UNSIGNED NOT NULL DEFAULT 0,
edited INT(10) UNSIGNED,
@@ -771,7 +774,7 @@
poster_id INT NOT NULL DEFAULT 1,
poster_ip VARCHAR(15),
poster_email VARCHAR(50),
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
hide_smilies SMALLINT NOT NULL DEFAULT 0,
posted INT NOT NULL DEFAULT 0,
edited INT,
@@ -788,7 +791,7 @@
poster_id INTEGER NOT NULL DEFAULT 1,
poster_ip VARCHAR(15),
poster_email VARCHAR(50),
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
hide_smilies INTEGER NOT NULL DEFAULT 0,
posted INTEGER NOT NULL DEFAULT 0,
edited INTEGER,
@@ -849,7 +852,7 @@
forum_id INT(10) UNSIGNED NOT NULL DEFAULT 0,
reported_by INT(10) UNSIGNED NOT NULL DEFAULT 0,
created INT(10) UNSIGNED NOT NULL DEFAULT 0,
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
zapped INT(10) UNSIGNED,
zapped_by INT(10) UNSIGNED,
PRIMARY KEY (id)
@@ -864,7 +867,7 @@
forum_id INT NOT NULL DEFAULT 0,
reported_by INT NOT NULL DEFAULT 0,
created INT NOT NULL DEFAULT 0,
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
zapped INT,
zapped_by INT,
PRIMARY KEY (id)
@@ -879,7 +882,7 @@
forum_id INTEGER NOT NULL DEFAULT 0,
reported_by INTEGER NOT NULL DEFAULT 0,
created INTEGER NOT NULL DEFAULT 0,
- message TEXT NOT NULL DEFAULT '',
+ message TEXT,
zapped INTEGER,
zapped_by INTEGER,
PRIMARY KEY (id)
@@ -898,7 +901,7 @@
$sql = 'CREATE TABLE '.$db_prefix."search_cache (
id INT(10) UNSIGNED NOT NULL DEFAULT 0,
ident VARCHAR(200) NOT NULL DEFAULT '',
- search_data TEXT NOT NULL DEFAULT '',
+ search_data TEXT,
PRIMARY KEY (id)
) TYPE=MyISAM;";
break;
@@ -907,7 +910,7 @@
$sql = 'CREATE TABLE '.$db_prefix."search_cache (
id INT NOT NULL DEFAULT 0,
ident VARCHAR(200) NOT NULL DEFAULT '',
- search_data TEXT NOT NULL DEFAULT '',
+ search_data TEXT,
PRIMARY KEY (id)
)";
break;
@@ -916,7 +919,7 @@
$sql = 'CREATE TABLE '.$db_prefix."search_cache (
id INTEGER NOT NULL DEFAULT 0,
ident VARCHAR(200) NOT NULL DEFAULT '',
- search_data TEXT NOT NULL DEFAULT '',
+ search_data TEXT,
PRIMARY KEY (id)
)";
break;
@@ -1231,6 +1234,7 @@
case 'mysql':
case 'mysqli':
// We use MySQL's ALTER TABLE ... ADD INDEX syntax instead of CREATE INDEX to avoid problems with users lacking the INDEX privilege
+ $queries[] = 'ALTER TABLE '.$db_prefix.'online ADD UNIQUE INDEX '.$db_prefix.'online_user_id_ident_idx(user_id,ident)';
$queries[] = 'ALTER TABLE '.$db_prefix.'online ADD INDEX '.$db_prefix.'online_user_id_idx(user_id)';
$queries[] = 'ALTER TABLE '.$db_prefix.'posts ADD INDEX '.$db_prefix.'posts_topic_id_idx(topic_id)';
$queries[] = 'ALTER TABLE '.$db_prefix.'posts ADD INDEX '.$db_prefix.'posts_multi_idx(poster_id, topic_id)';
@@ -1397,7 +1401,7 @@
/// Display config.php and give further instructions
- $config = '
@@ -1420,7 +1424,7 @@