diff options
| -rw-r--r-- | app/Models/FeedDAO.php | 4 | ||||
| -rw-r--r-- | app/SQL/install.sql.mysql.php | 5 | ||||
| -rw-r--r-- | app/SQL/install.sql.pgsql.php | 4 | ||||
| -rw-r--r-- | app/SQL/install.sql.sqlite.php | 7 |
4 files changed, 9 insertions, 11 deletions
diff --git a/app/Models/FeedDAO.php b/app/Models/FeedDAO.php index 5993f50dc..ef48789ff 100644 --- a/app/Models/FeedDAO.php +++ b/app/Models/FeedDAO.php @@ -49,11 +49,11 @@ class FreshRSS_FeedDAO extends Minz_ModelPdo implements FreshRSS_Searchable { } $values = array( - substr($valuesTmp['url'], 0, 511), + $valuesTmp['url'], $valuesTmp['kind'] ?? FreshRSS_Feed::KIND_RSS, $valuesTmp['category'], mb_strcut(trim($valuesTmp['name']), 0, FreshRSS_DatabaseDAO::LENGTH_INDEX_UNICODE, 'UTF-8'), - substr($valuesTmp['website'], 0, 255), + $valuesTmp['website'], sanitizeHTML($valuesTmp['description'], '', 1023), $valuesTmp['lastUpdate'], isset($valuesTmp['priority']) ? intval($valuesTmp['priority']) : FreshRSS_Feed::PRIORITY_MAIN_STREAM, diff --git a/app/SQL/install.sql.mysql.php b/app/SQL/install.sql.mysql.php index d85bd3dc3..3648e59d8 100644 --- a/app/SQL/install.sql.mysql.php +++ b/app/SQL/install.sql.mysql.php @@ -18,11 +18,11 @@ ENGINE = INNODB; CREATE TABLE IF NOT EXISTS `_feed` ( `id` INT NOT NULL AUTO_INCREMENT, -- v0.7 - `url` VARCHAR(511) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, + `url` VARCHAR(32768) CHARACTER SET latin1 COLLATE latin1_bin NOT NULL, `kind` SMALLINT DEFAULT 0, -- 1.20.0 `category` INT DEFAULT 0, -- 1.20.0 `name` VARCHAR(191) NOT NULL, - `website` VARCHAR(255) CHARACTER SET latin1 COLLATE latin1_bin, + `website` VARCHAR(32768) CHARACTER SET latin1 COLLATE latin1_bin, `description` TEXT, `lastUpdate` INT(11) DEFAULT 0, -- Until year 2038 `priority` TINYINT(2) NOT NULL DEFAULT 10, @@ -35,7 +35,6 @@ CREATE TABLE IF NOT EXISTS `_feed` ( `cache_nbUnreads` INT DEFAULT 0, -- v0.7 PRIMARY KEY (`id`), FOREIGN KEY (`category`) REFERENCES `_category`(`id`) ON DELETE SET NULL ON UPDATE CASCADE, - UNIQUE KEY (`url`), -- v0.7 INDEX (`name`), -- v0.7 INDEX (`priority`) -- v0.7 ) DEFAULT CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci diff --git a/app/SQL/install.sql.pgsql.php b/app/SQL/install.sql.pgsql.php index c4da2afad..00a30a8c7 100644 --- a/app/SQL/install.sql.pgsql.php +++ b/app/SQL/install.sql.pgsql.php @@ -15,11 +15,11 @@ CREATE TABLE IF NOT EXISTS `_category` ( CREATE TABLE IF NOT EXISTS `_feed` ( "id" SERIAL PRIMARY KEY, - "url" VARCHAR(511) UNIQUE NOT NULL, + "url" VARCHAR(32768) NOT NULL, "kind" SMALLINT DEFAULT 0, -- 1.20.0 "category" INT DEFAULT 0, -- 1.20.0 "name" VARCHAR(255) NOT NULL, - "website" VARCHAR(255), + "website" VARCHAR(32768), "description" TEXT, "lastUpdate" INT DEFAULT 0, "priority" SMALLINT NOT NULL DEFAULT 10, diff --git a/app/SQL/install.sql.sqlite.php b/app/SQL/install.sql.sqlite.php index ccf256d6a..8762b33eb 100644 --- a/app/SQL/install.sql.sqlite.php +++ b/app/SQL/install.sql.sqlite.php @@ -16,11 +16,11 @@ CREATE TABLE IF NOT EXISTS `category` ( CREATE TABLE IF NOT EXISTS `feed` ( `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, - `url` VARCHAR(511) NOT NULL, + `url` VARCHAR(32768) NOT NULL, `kind` SMALLINT DEFAULT 0, -- 1.20.0 `category` INTEGER DEFAULT 0, -- 1.20.0 `name` VARCHAR(255) NOT NULL, - `website` VARCHAR(255), + `website` VARCHAR(32768), `description` TEXT, `lastUpdate` INT(11) DEFAULT 0, -- Until year 2038 `priority` TINYINT(2) NOT NULL DEFAULT 10, @@ -31,8 +31,7 @@ CREATE TABLE IF NOT EXISTS `feed` ( `attributes` TEXT, -- v1.11.0 `cache_nbEntries` INT DEFAULT 0, `cache_nbUnreads` INT DEFAULT 0, - FOREIGN KEY (`category`) REFERENCES `category`(`id`) ON DELETE SET NULL ON UPDATE CASCADE, - UNIQUE (`url`) + FOREIGN KEY (`category`) REFERENCES `category`(`id`) ON DELETE SET NULL ON UPDATE CASCADE ); CREATE INDEX IF NOT EXISTS feed_name_index ON `feed`(`name`); CREATE INDEX IF NOT EXISTS feed_priority_index ON `feed`(`priority`); |