diff --git a/README.md b/README.md index 963e478..ac4748b 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ See [TinyIB Installations](https://gitlab.com/tslocum/tinyib/wikis/Home) for dem Please consider supporting the continued development of TinyIB. - [LiberaPay](https://liberapay.com/rocketnine.space) -- [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TEP9HT98XK7QA) +- [PayPal](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=TEP9HT98XK7QA) ## Install diff --git a/imgboard.php b/imgboard.php index f19f7c6..db77203 100644 --- a/imgboard.php +++ b/imgboard.php @@ -80,7 +80,7 @@ if (TINYIB_DBMODE == 'pdo' && TINYIB_DBDRIVER == 'pgsql') { "bumped" integer NOT NULL, "ip" varchar(255) NOT NULL, "name" varchar(75) NOT NULL, - "tripcode" varchar(10) NOT NULL, + "tripcode" varchar(24) NOT NULL, "email" varchar(75) NOT NULL, "nameblock" varchar(255) NOT NULL, "subject" varchar(75) NOT NULL, @@ -137,7 +137,7 @@ if (TINYIB_DBMODE == 'pdo' && TINYIB_DBDRIVER == 'pgsql') { `bumped` int(20) NOT NULL, `ip` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `name` varchar(75) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, - `tripcode` varchar(10) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, + `tripcode` varchar(24) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `email` varchar(75) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `nameblock` varchar(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, `subject` varchar(75) CHARACTER SET utf8 COLLATE utf8_unicode_ci NOT NULL, diff --git a/inc/database/mysql_link.php b/inc/database/mysql_link.php index 3fa73da..cebbed8 100644 --- a/inc/database/mysql_link.php +++ b/inc/database/mysql_link.php @@ -45,6 +45,8 @@ if (mysql_num_rows(mysql_query("SHOW COLUMNS FROM `" . TINYIB_DBPOSTS . "` LIKE mysql_query("ALTER TABLE `" . TINYIB_DBPOSTS . "` ADD COLUMN locked TINYINT(1) NOT NULL DEFAULT '0'"); } +mysql_query("ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY tripcode VARCHAR(24) NOT NULL DEFAULT ''"); + mysql_query("ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); mysql_query("ALTER TABLE `" . TINYIB_DBBANS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); diff --git a/inc/database/mysqli_link.php b/inc/database/mysqli_link.php index 5150108..3ac4001 100644 --- a/inc/database/mysqli_link.php +++ b/inc/database/mysqli_link.php @@ -45,6 +45,8 @@ if (mysqli_num_rows(mysqli_query($link, "SHOW COLUMNS FROM `" . TINYIB_DBPOSTS . mysqli_query($link, "ALTER TABLE `" . TINYIB_DBPOSTS . "` ADD COLUMN locked TINYINT(1) NOT NULL DEFAULT '0'"); } +mysqli_query($link, "ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY tripcode VARCHAR(24) NOT NULL DEFAULT ''"); + mysqli_query($link, "ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); mysqli_query($link, "ALTER TABLE `" . TINYIB_DBBANS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); diff --git a/inc/database/pdo_link.php b/inc/database/pdo_link.php index 60b94d7..5630cba 100644 --- a/inc/database/pdo_link.php +++ b/inc/database/pdo_link.php @@ -112,9 +112,13 @@ if (!$locked_exists) { } if (TINYIB_DBDRIVER === 'pgsql') { + $dbh->query("ALTER TABLE `" . TINYIB_DBPOSTS . "` ALTER COLUMN tripcode VARCHAR(24) NOT NULL DEFAULT ''"); + $dbh->query("ALTER TABLE `" . TINYIB_DBPOSTS . "` ALTER COLUMN ip VARCHAR(255) NOT NULL DEFAULT ''"); $dbh->query("ALTER TABLE `" . TINYIB_DBBANS . "` ALTER COLUMN ip VARCHAR(255) NOT NULL DEFAULT ''"); } else { + $dbh->query("ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY tripcode VARCHAR(24) NOT NULL DEFAULT ''"); + $dbh->query("ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); $dbh->query("ALTER TABLE `" . TINYIB_DBBANS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); } diff --git a/inc/database/sqlite3_link.php b/inc/database/sqlite3_link.php index e64943e..a5fb17f 100644 --- a/inc/database/sqlite3_link.php +++ b/inc/database/sqlite3_link.php @@ -85,9 +85,6 @@ if (!$result->fetchArray()) { // Add locked column if it isn't present @$db->exec("ALTER TABLE " . TINYIB_DBPOSTS . " ADD COLUMN locked INTEGER NOT NULL DEFAULT '0'"); -@$db->exec("ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); -@$db->exec("ALTER TABLE `" . TINYIB_DBBANS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); - if (function_exists('insertPost')) { function migratePost($post) { global $db; diff --git a/inc/database/sqlite_link.php b/inc/database/sqlite_link.php index 1b1f6fb..8d24602 100644 --- a/inc/database/sqlite_link.php +++ b/inc/database/sqlite_link.php @@ -84,9 +84,6 @@ sqlite_query($db, "ALTER TABLE " . TINYIB_DBPOSTS . " ADD COLUMN stickied INTEGE // Add locked column if it isn't present sqlite_query($db, "ALTER TABLE " . TINYIB_DBPOSTS . " ADD COLUMN locked INTEGER NOT NULL DEFAULT '0'"); -sqlite_query($db, "ALTER TABLE `" . TINYIB_DBPOSTS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); -sqlite_query($db, "ALTER TABLE `" . TINYIB_DBBANS . "` MODIFY ip VARCHAR(255) NOT NULL DEFAULT ''"); - if (function_exists('insertPost')) { function migratePost($post) { sqlite_query($GLOBALS["db"], "INSERT INTO " . TINYIB_DBPOSTS . " (id, parent, timestamp, bumped, ip, name, tripcode, email, nameblock, subject, message, password, file, file_hex, file_original, file_size, file_size_formatted, image_width, image_height, thumb, thumb_width, thumb_height, moderated, stickied, locked) VALUES (" . $post['id'] . ", " . $post['parent'] . ", " . $post['timestamp'] . ", " . $post['bumped'] . ", '" . sqlite_escape_string($post['ip']) . "', '" . sqlite_escape_string($post['name']) . "', '" . sqlite_escape_string($post['tripcode']) . "', '" . sqlite_escape_string($post['email']) . "', '" . sqlite_escape_string($post['nameblock']) . "', '" . sqlite_escape_string($post['subject']) . "', '" . sqlite_escape_string($post['message']) . "', '" . sqlite_escape_string($post['password']) . "', '" . $post['file'] . "', '" . $post['file_hex'] . "', '" . sqlite_escape_string($post['file_original']) . "', " . $post['file_size'] . ", '" . $post['file_size_formatted'] . "', " . $post['image_width'] . ", " . $post['image_height'] . ", '" . $post['thumb'] . "', " . $post['thumb_width'] . ", " . $post['thumb_height'] . ", " . $post['moderated'] . ", " . $post['stickied'] . ", " . $post['locked'] . ")");