summaryrefslogtreecommitdiff
path: root/www
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 /www
parent4cc46f268676d8df88ce6003df2a7bc9249fe7fb (diff)
downloadsemanticscuttle-65bd4bfab86fc47be3ce125640ebd49163f24f4b.tar.gz
semanticscuttle-65bd4bfab86fc47be3ce125640ebd49163f24f4b.tar.bz2
Updates for feature request 3164348: Make default privacy configurable.
Diffstat (limited to 'www')
-rw-r--r--www/api/posts_add.php2
-rw-r--r--www/bookmarks.php4
-rw-r--r--www/edit.php2
-rw-r--r--www/import.php4
-rw-r--r--www/importNetscape.php4
5 files changed, 8 insertions, 8 deletions
diff --git a/www/api/posts_add.php b/www/api/posts_add.php
index 7f9dc59..80d6515 100644
--- a/www/api/posts_add.php
+++ b/www/api/posts_add.php
@@ -81,7 +81,7 @@ if (isset($_REQUEST['dt']) && (trim($_REQUEST['dt']) != '')) {
$replace = isset($_REQUEST['replace']) && ($_REQUEST['replace'] == 'yes');
-$status = 0;
+$status = $GLOBALS['defaults']['privacy'];
if (isset($_REQUEST['status'])) {
$status_str = trim($_REQUEST['status']);
if (is_numeric($status_str)) {
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 5241481..d4fe051 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -185,7 +185,7 @@ if ($templatename == 'editbookmark.tpl') {
'bDescription' => stripslashes(POST_DESCRIPTION),
'bPrivateNote' => stripslashes(POST_PRIVATENOTE),
'tags' => (POST_TAGS ? explode(',', stripslashes(POST_TAGS)) : array()),
- 'bStatus' => 0,
+ 'bStatus' => $GLOBALS['defaults']['privacy'],
);
$tplVars['tags'] = POST_TAGS;
} else {
@@ -201,7 +201,7 @@ if ($templatename == 'editbookmark.tpl') {
'bDescription' => stripslashes(GET_DESCRIPTION),
'bPrivateNote' => stripslashes(GET_PRIVATENOTE),
'tags' => (GET_TAGS ? explode(',', stripslashes(GET_TAGS)) : array()),
- 'bStatus' => 0
+ 'bStatus' => $GLOBALS['defaults']['privacy']
);
}
diff --git a/www/edit.php b/www/edit.php
index fbea163..cbfa30b 100644
--- a/www/edit.php
+++ b/www/edit.php
@@ -33,7 +33,7 @@ isset($_POST['title']) ? define('POST_TITLE', $_POST['title']): define('POST_TIT
isset($_POST['address']) ? define('POST_ADDRESS', $_POST['address']): define('POST_ADDRESS', '');
isset($_POST['description']) ? define('POST_DESCRIPTION', $_POST['description']): define('POST_DESCRIPTION', '');
isset($_POST['privateNote']) ? define('POST_PRIVATENOTE', $_POST['privateNote']): define('POST_PRIVATENOTE', '');
-isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
+isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']);
isset($_POST['tags']) ? define('POST_TAGS', $_POST['tags']): define('POST_TAGS', '');
isset($_GET['popup']) ? define('GET_POPUP', $_GET['popup']): define('GET_POPUP', '');
diff --git a/www/import.php b/www/import.php
index 5263aba..3aa2714 100644
--- a/www/import.php
+++ b/www/import.php
@@ -27,7 +27,7 @@ require_once 'www-header.php';
/* Managing all possible inputs */
// First input is $_FILES
// Other inputs
-isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
+isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']);
if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['size'] > 0) {
@@ -36,7 +36,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
if (is_numeric(POST_STATUS)) {
$status = intval(POST_STATUS);
} else {
- $status = 2;
+ $status = $GLOBALS['defaults']['privacy'];
}
$depth = array();
diff --git a/www/importNetscape.php b/www/importNetscape.php
index e23c156..b476c40 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -28,7 +28,7 @@ $bookmarkservice =SemanticScuttle_Service_Factory::get('Bookmark');
/* Managing all possible inputs */
// First input is $_FILES
// Other inputs
-isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', '');
+isset($_POST['status']) ? define('POST_STATUS', $_POST['status']): define('POST_STATUS', $GLOBALS['defaults']['privacy']);
$countImportedBookmarks = 0;
$tplVars['msg'] = '';
@@ -39,7 +39,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
if (is_numeric(POST_STATUS)) {
$status = intval(POST_STATUS);
} else {
- $status = 2;
+ $status = $GLOBALS['defaults']['privacy'];
}
// File handle