summaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorbretticvs <bsdee@frii.com>2011-03-15 07:53:39 +0100
committerChristian Weiske <cweiske@cweiske.de>2011-03-15 07:53:39 +0100
commit65bd4bfab86fc47be3ce125640ebd49163f24f4b (patch)
tree7f1c5464bfee6204f19d361bd1425d0328e9e1c9 /data
parent4cc46f268676d8df88ce6003df2a7bc9249fe7fb (diff)
downloadsemanticscuttle-65bd4bfab86fc47be3ce125640ebd49163f24f4b.tar.gz
semanticscuttle-65bd4bfab86fc47be3ce125640ebd49163f24f4b.tar.bz2
Updates for feature request 3164348: Make default privacy configurable.
Diffstat (limited to 'data')
-rw-r--r--data/config.default.php17
-rw-r--r--data/config.php.dist22
-rw-r--r--data/templates/bookmarks.tpl.php2
3 files changed, 40 insertions, 1 deletions
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
@@ -8,6 +8,13 @@
*/
/**
+ * Array for defaults.
+ *
+ * @var array
+ */
+$defaults = array();
+
+/**
* The name of this site.
*
* @var string
@@ -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';