From 2077464d464e485a978166604faf158b654fb0cb Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Tue, 3 May 2011 09:14:32 +0200
Subject: begin bookmark model class with URL validation method

---
 data/config.default.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'data')

diff --git a/data/config.default.php b/data/config.default.php
index af79891..b2c7307 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -462,6 +462,21 @@ $filetypes = array(
     'video'    => array('avi', 'mov', 'mp4', 'mpeg', 'mpg', 'wmv')
 );
 
+/**
+ * Link protocols that are allowed for newly added bookmarks.
+ * This prevents i.e. adding javascript: links.
+ *
+ * @link http://en.wikipedia.org/wiki/URI_scheme
+ *
+ * @var array
+ */
+$allowedProtocols = array(
+    'ftp', 'ftps',
+    'http', 'https',
+    'mailto', 'nntp',
+    'xmpp'
+);
+
 /**
  * Enable the "common bookmark description" functionality
  *
-- 
cgit v1.2.3-54-g00ecf


From dda05f5cc7e1d984564e5154f6ceda762c2224a3 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 4 May 2011 08:02:33 +0200
Subject: SQL schema version table to ease future database upgrades

---
 data/schema/6.sql |  4 ++++
 data/tables.sql   |  8 +++++++-
 doc/ChangeLog     |  1 +
 doc/UPGRADE.txt   | 11 +++++++++++
 4 files changed, 23 insertions(+), 1 deletion(-)
 create mode 100644 data/schema/6.sql

(limited to 'data')

diff --git a/data/schema/6.sql b/data/schema/6.sql
new file mode 100644
index 0000000..4ae7cb9
--- /dev/null
+++ b/data/schema/6.sql
@@ -0,0 +1,4 @@
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
diff --git a/data/tables.sql b/data/tables.sql
index c61c2f5..7a9c5bd 100644
--- a/data/tables.sql
+++ b/data/tables.sql
@@ -182,4 +182,10 @@ CREATE TABLE `sc_votes` (
   UNIQUE KEY `bid_2` (`bId`,`uId`),
   KEY `bid` (`bId`),
   KEY `uid` (`uId`)
-) CHARACTER SET utf8 COLLATE utf8_general_ci ;
\ No newline at end of file
+) CHARACTER SET utf8 COLLATE utf8_general_ci ;
+
+
+CREATE TABLE `sc_version` (
+  `schema_version` int(11) NOT NULL
+) DEFAULT CHARSET=utf8;
+INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
diff --git a/doc/ChangeLog b/doc/ChangeLog
index d9b6f57..a54e71e 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -16,6 +16,7 @@ ChangeLog for SemantiScuttle
 - Fix privacy issue when fetching tags of several users
 - Only URLs with an allowed protocol may be added to the database
 - Support HTTPS connections when $root is not configured
+- SQL schema version table to ease future database upgrades
 
 
 0.97.2 - 2011-02-17
diff --git a/doc/UPGRADE.txt b/doc/UPGRADE.txt
index c4470f9..3be6654 100644
--- a/doc/UPGRADE.txt
+++ b/doc/UPGRADE.txt
@@ -2,6 +2,17 @@ Upgrading SemanticScuttle from a previous version
 =================================================
 
 
+From version 0.97 to 0.98
+-------------------------
+Database updates: Apply data/schema/6.sql or do the following:
+
+    CREATE TABLE `sc_version` (
+      `schema_version` int(11) NOT NULL
+    ) DEFAULT CHARSET=utf8;
+
+    INSERT INTO `sc_version` (`schema_version`) VALUES ('6');
+
+
 From version 0.96 to 0.97
 -------------------------
 No database changes necessary.
-- 
cgit v1.2.3-54-g00ecf