From 65bd4bfab86fc47be3ce125640ebd49163f24f4b Mon Sep 17 00:00:00 2001
From: bretticvs
Date: Tue, 15 Mar 2011 07:53:39 +0100
Subject: Updates for feature request 3164348: Make default privacy
 configurable.

---
 data/config.default.php          | 17 +++++++++++++++++
 data/config.php.dist             | 22 ++++++++++++++++++++++
 data/templates/bookmarks.tpl.php |  2 +-
 3 files changed, 40 insertions(+), 1 deletion(-)

(limited to 'data')

diff --git a/data/config.default.php b/data/config.default.php
index bd67c7b..cd611f1 100644
--- a/data/config.default.php
+++ b/data/config.default.php
@@ -14,6 +14,13 @@
  * @link http://sourceforge.net/projects/semanticscuttle/
  */
 
+/**
+ * Array for defaults.
+ *
+ * @var array
+ */
+$defaults = array();
+
 
 /***************************************************
  * HTML output configuration
@@ -493,6 +500,16 @@ $votingMode = 2;
  */
 $hideBelowVoting = null;
 
+/**
+ * Default privacy setting for bookmarks:
+ * 0 - Public
+ * 1 - Shared with Watchlist
+ * 2 - Private
+ *
+ * @var integer
+ */
+$defaults['privacy'] = 0;
+
 
 /****************************
  * Website Thumbnails
diff --git a/data/config.php.dist b/data/config.php.dist
index c135e8e..0f849e2 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -7,6 +7,13 @@
  * See config.default.inc.php for more options.
  */
 
+/**
+ * Array for defaults.
+ *
+ * @var array 
+ */
+$defaults = array();
+
 /**
  * The name of this site.
  *
@@ -116,6 +123,21 @@ $adminemail = 'admin@example.org';
 $admin_users = array();
 
 
+/***************************************************
+ * Bookmarks 
+ */
+
+/**
+ * Default privacy setting for bookmarks.
+ * 0 - Public
+ * 1 - Shared with Watchlist
+ * 2 - Private
+ *
+ * @var integer 
+ */
+$defaults['privacy'] = 0;
+
+
 /**
 * You have completed the basic configuration!
 * More options can be found in config.default.php.
diff --git a/data/templates/bookmarks.tpl.php b/data/templates/bookmarks.tpl.php
index e32d3c9..44dfe90 100644
--- a/data/templates/bookmarks.tpl.php
+++ b/data/templates/bookmarks.tpl.php
@@ -256,7 +256,7 @@ if ($currenttag!= '') {
 	foreach ($bookmarks as $key => &$row) {
 		switch ($row['bStatus']) {
 			case 0:
-				$access = '';
+				$access = ' public';
 				break;
 			case 1:
 				$access = ' shared';
-- 
cgit v1.2.3-54-g00ecf