From a67a7f761d7f0b4567ba8e9903fbcae075df4c73 Mon Sep 17 00:00:00 2001
From: José María Mateos
Date: Sun, 17 Mar 2013 17:16:57 +0100
Subject: Changed commit comment information
---
data/config.php.dist | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/data/config.php.dist b/data/config.php.dist
index 302d55f..5f49857 100644
--- a/data/config.php.dist
+++ b/data/config.php.dist
@@ -2,9 +2,9 @@
/**
* Configuration for SemanticScuttle.
*
- * Copy this file to config.inc.php and adjust it.
+ * Copy this file to config.php and adjust it.
*
- * See config.default.inc.php for more options.
+ * See config.default.php for more options.
*/
--
cgit v1.2.3-54-g00ecf
From 943d149e31f5774208ce6619d1503d9c89ae72ae Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 18 Mar 2013 22:18:09 +0100
Subject: Fix bug #109: preserve privacy setting from Delicious export files.
Thanks for David Glenck for the initial version of this patch.
---
www/importNetscape.php | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/www/importNetscape.php b/www/importNetscape.php
index b476c40..a014b95 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -67,6 +67,8 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
$bDatetime = ""; //bDateTime optional
$bCategories = ""; //bCategories optional
+ $bPrivateNote = ""; //bPrivateNote optional
+ $bPrivate = $status; //bPrivate set default
foreach ($attributes[0] as $attribute) {
$att = preg_split('/\s*=\s*/s', $attribute, 2);
@@ -86,6 +88,11 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
break;
case "NOTE":
$bPrivateNote = $attrVal;
+ break;
+ case "PRIVATE":
+ if ($attrVal) {
+ $bPrivate = 2;//private
+ }
}
}
$bTitle = trim($titles[$i]);
@@ -102,7 +109,7 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
$bDatetime = gmdate('Y-m-d H:i:s');
}
- if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $status, $bCategories, null, $bDatetime, false, true)) {
+ if ($bookmarkservice->addBookmark($bAddress, $bTitle, $bDescription, $bPrivateNote, $bPrivate, $bCategories, null, $bDatetime, false, true)) {
$countImportedBookmarks++;
} else {
$tplVars['error'] = T_('There was an error saving your bookmark. Please try again or contact the administrator.');
--
cgit v1.2.3-54-g00ecf
From 326bca97316f66a9ec511275e2971a5067c924ab Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 18 Mar 2013 22:30:12 +0100
Subject: get rid of deprecated eregi function and fix replacement
---
www/importNetscape.php | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/www/importNetscape.php b/www/importNetscape.php
index a014b95..9a52407 100644
--- a/www/importNetscape.php
+++ b/www/importNetscape.php
@@ -74,7 +74,10 @@ if ($userservice->isLoggedOn() && sizeof($_FILES) > 0 && $_FILES['userfile']['si
$att = preg_split('/\s*=\s*/s', $attribute, 2);
$attrTitle = $att[0];
- $attrVal = eregi_replace('"', '"', preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1]));
+ $attrVal = str_replace(
+ '"', '"',
+ preg_replace('/([\'"]?)(.*)\1/', '$2', $att[1])
+ );
switch ($attrTitle) {
case "HREF":
--
cgit v1.2.3-54-g00ecf
From 409b7e681d93e7c746ed4e3487fbf7f0de5fd116 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 18 Mar 2013 23:04:49 +0100
Subject: Fix bug #110: Talk about searching for slashes
---
doc/configuration.rst | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/doc/configuration.rst b/doc/configuration.rst
index c8a8bd9..dd0fb5e 100644
--- a/doc/configuration.rst
+++ b/doc/configuration.rst
@@ -79,3 +79,20 @@ or::
$root = "http://bookmarks.example.org/";
+
+Common problems
+===============
+Searching for words with slashes "/" does not work
+--------------------------------------------------
+When searching for a phrase with a slash in it, like "foo/bar", you
+may get a 404 error.
+
+In that case, you need to enable AllowEncodedSlashes__ in your Apache
+virtual host configuration::
+
+ AllowEncodedSlashes NoDecode
+
+Restart apache after changing the vhost config file.
+Searching will work now.
+
+__ http://httpd.apache.org/docs/2.2/mod/core.html#allowencodedslashes
--
cgit v1.2.3-54-g00ecf
From 54b5726157c262df3d79e0f92bfacc6d13dfb47b Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Wed, 20 Mar 2013 18:06:15 +0100
Subject: prepare release of 0.98.5
---
build.xml | 35 ++++++++++++++++-------------------
data/templates/default/about.tpl.php | 2 +-
doc/ChangeLog | 10 ++++++++++
doc/README.rst | 2 +-
4 files changed, 28 insertions(+), 21 deletions(-)
diff --git a/build.xml b/build.xml
index 431fdbf..828515f 100644
--- a/build.xml
+++ b/build.xml
@@ -10,27 +10,15 @@
-
+
@@ -152,6 +140,15 @@
type="pear-config" from="@data_dir@" to="data_dir"
/>
+
+- Fix bug #109: preserve privacy setting from Delicious export files
+ (Thanks to David Glenck)
+- Fix bug #110: Document solution for "searching slashes"
+- Fix bug #111: Comments in config.php mention *.inc.php files
+ (José María Mateos [rinze])
+- Fix bug: Do not use eregi functions anymore
+
+
- Fix bug #3439729: URLs were escaped too often in bookmark list
- Fix bug: Subtitle was not escaped
diff --git a/data/templates/default/about.tpl.php b/data/templates/default/about.tpl.php
index d850783..843a31f 100644
--- a/data/templates/default/about.tpl.php
+++ b/data/templates/default/about.tpl.php
@@ -17,7 +17,7 @@ $this->includeTemplate($GLOBALS['top_include']);
isAdmin()): ?>
-SemanticScuttle v0.98.4
+SemanticScuttle v0.98.5
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1711127..ff60527 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,16 @@ ChangeLog for SemantiScuttle
.. contents::
+0.98.5 - 2013-03-20
+-------------------
+- Fix bug #109: preserve privacy setting from Delicious export files
+ (Thanks to David Glenck)
+- Fix bug #110: Document solution for "searching slashes"
+- Fix bug #111: Comments in config.php mention \*.inc.php files
+ (José María Mateos [rinze])
+- Fix bug: Do not use eregi functions anymore
+
+
0.98.4 - 2012-01-21
-------------------
- Fix bug #3439729: URLs were escaped too often in bookmark list
diff --git a/doc/README.rst b/doc/README.rst
index caf6b75..ed41a38 100644
--- a/doc/README.rst
+++ b/doc/README.rst
@@ -1,5 +1,5 @@
======================
-SemanticScuttle 0.98.4
+SemanticScuttle 0.98.5
======================
A social bookmarking tool experimenting with new features
like structured tags or collaborative descriptions of tags.
--
cgit v1.2.3-54-g00ecf