From cf4036104b5fffd63473dfa53f44fd15ef4d1727 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 16 Aug 2011 20:09:41 +0200
Subject: [PATCH 1/8] fix sioc export

---
 www/api/export_sioc.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/www/api/export_sioc.php b/www/api/export_sioc.php
index 8bdfd70..47ffc96 100644
--- a/www/api/export_sioc.php
+++ b/www/api/export_sioc.php
@@ -67,9 +67,9 @@ $bookmarks =& $bookmarkservice->getBookmarks(0, NULL, NULL, NULL);
 <?php foreach($bookmarks['bookmarks'] as $bookmark): ?>
 <bm:Bookmark rdf:about="<?php echo createUrl('history', $bookmark['bHash']) ?>">
   <dc:title><?php echo filter($bookmark['bTitle']) ?></dc:title>
-  <dc:created><?php echo filter($bookmark['bCreated']) ?></dc:created>
+  <dc:created><?php echo filter($bookmark['bDatetime']) ?></dc:created>
   <dc:description><?php echo filter(strip_tags($bookmark['bDescription'])) ?></dc:description>
-  <dc:date><?php echo $bookmark['bDateTime'] ?></dc:date>
+  <dc:date><?php echo $bookmark['bModified'] ?></dc:date>
   <bm:recalls rdf:resource="<?php echo filter($bookmark['bAddress']) ?>"/>
   <sioc:owner_of rdf:resource="<?php echo createUrl('profile', $usersArray[$bookmark['uId']]) ?>"/>
   <?php foreach($bookmark['tags'] as $tag): ?>

From 160ce01f7b709c38e9c3c081076a2d3e561ae2c5 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 17 Aug 2011 18:16:50 +0200
Subject: [PATCH 2/8] prevent notice when sidebar blocks are not defined

---
 data/templates/default/sidebar.tpl.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/data/templates/default/sidebar.tpl.php b/data/templates/default/sidebar.tpl.php
index e823af5..b4fac96 100644
--- a/data/templates/default/sidebar.tpl.php
+++ b/data/templates/default/sidebar.tpl.php
@@ -1,4 +1,6 @@
-<?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid)): ?>
+<?php if ($GLOBALS['enableAdminColors'] != false
+    && isset($userid) && $userservice->isAdmin($userid)
+): ?>
 <div id="sidebar" class="adminBackground">
 <?php else: ?>
 <div id="sidebar">
@@ -8,9 +10,11 @@
 <?php
 echo $GLOBALS['sidebarTopMessage'].' ';
 
-$size = count($sidebar_blocks);
-for ($i = 0; $i < $size; $i++) {
-	$this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]);
+if (isset($sidebar_blocks) && count($sidebar_blocks)) {
+    $size = count($sidebar_blocks);
+    for ($i = 0; $i < $size; $i++) {
+        $this->includeTemplate('sidebar.block.'. $sidebar_blocks[$i]);
+    }
 }
 
 echo $GLOBALS['sidebarBottomMessage'];

From 34600fe502c625217776c909903035d9ab937dea Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 17 Aug 2011 18:20:52 +0200
Subject: [PATCH 3/8] Fix bug: URLs were escaped too often in bookmark list

---
 data/templates/default/bookmarks.tpl.php |  6 ++---
 doc/ChangeLog                            |  5 +++++
 tests/www/bookmarksTest.php              | 28 ++++++++++++++++++++++++
 3 files changed, 36 insertions(+), 3 deletions(-)

diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php
index 0ed9c1d..70fe788 100644
--- a/data/templates/default/bookmarks.tpl.php
+++ b/data/templates/default/bookmarks.tpl.php
@@ -107,7 +107,7 @@ if($userservice->isLoggedOn()) {
 }
 ?>
 
-<?php if (count($bookmarks) > 0) { ?>
+<?php if (isset($bookmarks) && count($bookmarks) > 0) { ?>
 <script type="text/javascript">
 window.onload = playerLoad;
 </script>
@@ -358,7 +358,7 @@ if ($currenttag!= '') {
 			$rel = ' rel="nofollow"';
 		}
 
-		$address  = filter($row['bAddress']);
+		$address  = $row['bAddress'];
 		$oaddress = $address;
 		// Redirection option
 		if ($GLOBALS['useredir']) {
@@ -418,7 +418,7 @@ if ($currenttag!= '') {
 
 		}
 		echo '   <div class="description">'. nl2br($bkDescription) ."</div>\n";
-        echo '   <div class="address">' . shortenString($oaddress) . "</div>\n";
+        echo '   <div class="address">' . htmlspecialchars(shortenString($oaddress)) . "</div>\n";
 
 		echo '   <div class="meta">'
             . $cats . "\n"
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 942c65c..1c5f36f 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -3,6 +3,11 @@ ChangeLog for SemantiScuttle
 
 .. contents::
 
+0.98.4 - 2011-XX-XX
+-------------------
+- Fix bug: URLs were escaped too often in bookmark list
+
+
 0.98.3 - 2011-08-09
 -------------------
 - Fix bug #3388456: Missing scripts/fix-unfiled-tags.php
diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index ae82118..ac549d8 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -124,5 +124,33 @@ class www_bookmarksTest extends TestBaseApi
         $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
     }//end testVerifyPrivateRSSLinkDoesNotExist
 
+
+
+    /**
+     * We once had the bug that URLs with special characters were escaped too
+     * often. & -> &amp;
+     */
+    public function testAddressEncoding()
+    {
+        $this->addBookmark(null, 'http://example.org?foo&bar=baz');
+
+        //get rid of bookmarks.php
+        $this->url = $GLOBALS['unittestUrl'];
+
+        $html = $this->getRequest()->send()->getBody();
+        $x = simplexml_load_string($html);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:a[@class="taggedlink"]');
+        $this->assertEquals(
+            1, count($elements), 'Number of links is not 1'
+        );
+        $this->assertEquals(
+            'http://example.org?foo&bar=baz',
+            (string)$elements[0]['href']
+        );
+    }
+
 }//end class www_bookmarksTest
 ?>

From 000daf70ca8e3301b88be310949d4cd6cbadce4e Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Wed, 17 Aug 2011 18:24:26 +0200
Subject: [PATCH 4/8] Fix bug: Subtitle was not escaped

---
 data/templates/default/top.inc.php | 2 +-
 doc/ChangeLog                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index 17ec982..f2adba4 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -49,7 +49,7 @@ if(!isset($_GET['popup'])) {
 
 <?php
 if (isset($subtitle)) {
-	echo '<h2>'. $subtitle ."</h2>\n";
+	echo '<h2>'. htmlspecialchars($subtitle) ."</h2>\n";
 }
 if(DEBUG_MODE) {
 	echo '<p class="error">'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."</p>\n";
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 1c5f36f..05a6405 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -6,6 +6,7 @@ ChangeLog for SemantiScuttle
 0.98.4 - 2011-XX-XX
 -------------------
 - Fix bug: URLs were escaped too often in bookmark list
+- Fix bug: Subtitle was not escaped
 
 
 0.98.3 - 2011-08-09

From 7a82f3ef2da0da3d49ae5d013734c29fdcdfe728 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Thu, 18 Aug 2011 16:18:28 +0200
Subject: [PATCH 5/8] revise bugfix of unescaped subtitle

---
 data/templates/default/top.inc.php | 6 ++++--
 www/bookmarks.php                  | 2 +-
 www/tags.php                       | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/data/templates/default/top.inc.php b/data/templates/default/top.inc.php
index f2adba4..240e5b2 100644
--- a/data/templates/default/top.inc.php
+++ b/data/templates/default/top.inc.php
@@ -48,8 +48,10 @@ if(!isset($_GET['popup'])) {
 ?></div>
 
 <?php
-if (isset($subtitle)) {
-	echo '<h2>'. htmlspecialchars($subtitle) ."</h2>\n";
+if (isset($subtitlehtml)) {
+	echo '<h2>' . $subtitlehtml . "</h2>\n";
+} else if (isset($subtitle)) {
+      echo '<h2>' . htmlspecialchars($subtitle) . "</h2>\n";
 }
 if(DEBUG_MODE) {
 	echo '<p class="error">'. T_('Admins, your installation is in "Debug Mode" ($debugMode = true). To go in "Normal Mode" and hide debugging messages, change $debugMode to false into config.php.') ."</p>\n";
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 72c063e..54daed2 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -303,7 +303,7 @@ if ($templatename == 'editbookmark.tpl') {
 	$tplVars['nav_url'] = createURL('bookmarks', '%s/%s%s');
 	if ($userservice->isLoggedOn() && $user == $currentUsername) {
 		$tplVars['pagetitle'] = T_('My Bookmarks') . $catTitle;
-		$tplVars['subtitle'] =  T_('My Bookmarks') . $catTitleWithUrls;
+		$tplVars['subtitlehtml'] =  T_('My Bookmarks') . $catTitleWithUrls;
 	} else {
 		$tplVars['pagetitle'] = $user.': '.$cat;
 		$tplVars['subtitle'] = $pagetitle;
diff --git a/www/tags.php b/www/tags.php
index 127f6c5..c56b97f 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -107,7 +107,7 @@ $tplVars['start'] = $start;
 $tplVars['popCount'] = 25;
 $tplVars['currenttag'] = $cat;
 $tplVars['sidebar_blocks'] = array('linked', 'related', 'menu2');//array('linked', 'related', 'popular');
-$tplVars['subtitle'] = $pagetitle;
+$tplVars['subtitlehtml'] = $pagetitle;
 $tplVars['bookmarkCount'] = $start + 1;
 $bookmarks =& $bookmarkservice->getBookmarks($start, $perpage, NULL, $cat, NULL, getSortOrder());
 $tplVars['total'] = $bookmarks['total'];

From adf2655b2342e91c952c71364f91f6cb2e2d4016 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 19 Aug 2011 19:01:19 +0200
Subject: [PATCH 6/8] Fix bug #3393951: Logo images missing on bookmark page

---
 data/templates/default/bookmarks.tpl.php | 4 ++--
 doc/ChangeLog                            | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/templates/default/bookmarks.tpl.php b/data/templates/default/bookmarks.tpl.php
index 70fe788..2a3d169 100644
--- a/data/templates/default/bookmarks.tpl.php
+++ b/data/templates/default/bookmarks.tpl.php
@@ -39,9 +39,9 @@ include('search.menu.php');
 
 <?php if($GLOBALS['enableAdminColors']!=false && isset($userid) && $userservice->isAdmin($userid) && $pageName != PAGE_WATCHLIST) : ?>
 <div style="width:70%;text-align:center;">
- <img src="<?php $theme->resource('images/logo_24.gif'); ?>" width="12px"/>
+ <img src="<?php echo $theme->resource('images/logo_24.gif'); ?>" width="12px"/>
  <?php echo T_('Bookmarks on this page are managed by an admin user.'); ?>
- <img src="<?php $theme->resource('images/logo_24.gif'); ?>" width="12px"/>
+ <img src="<?php echo $theme->resource('images/logo_24.gif'); ?>" width="12px"/>
 </div>
 <?php endif?>
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 05a6405..0d3563c 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -7,6 +7,7 @@ ChangeLog for SemantiScuttle
 -------------------
 - Fix bug: URLs were escaped too often in bookmark list
 - Fix bug: Subtitle was not escaped
+- Fix bug #3393951: Logo images missing on bookmark page
 
 
 0.98.3 - 2011-08-09

From 5d929ec8e0b9bbee267c2eaa1837ce1910d08420 Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Fri, 19 Aug 2011 19:16:45 +0200
Subject: [PATCH 7/8] Fix bug #3388219: Incorrect URL when cancelling
 tag2tag-actions

---
 doc/ChangeLog         | 1 +
 www/tag2tagadd.php    | 2 +-
 www/tag2tagdelete.php | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 0d3563c..7e3a064 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -8,6 +8,7 @@ ChangeLog for SemantiScuttle
 - Fix bug: URLs were escaped too often in bookmark list
 - Fix bug: Subtitle was not escaped
 - Fix bug #3393951: Logo images missing on bookmark page
+- Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
 
 
 0.98.3 - 2011-08-09
diff --git a/www/tag2tagadd.php b/www/tag2tagadd.php
index d660451..3f4af8c 100644
--- a/www/tag2tagadd.php
+++ b/www/tag2tagadd.php
@@ -59,7 +59,7 @@ if (POST_CONFIRM != '') {
         exit();
     }
 } elseif (POST_CANCEL) {
-    header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+    header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
 }
 
 $tplVars['links']	= $tag2tagservice->getLinks($currentUser->getId());
diff --git a/www/tag2tagdelete.php b/www/tag2tagdelete.php
index c1e52cd..06fea98 100644
--- a/www/tag2tagdelete.php
+++ b/www/tag2tagdelete.php
@@ -71,7 +71,7 @@ if (POST_CONFIRM) {
 		exit();
 	}
 } elseif (POST_CANCEL) {
-	header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tags));
+	header('Location: '. createURL('bookmarks', $currentUser->getUsername() .'/'. $tag1));
 }
 
 $tplVars['links']	= $tag2tagservice->getLinks($currentUser->getId());

From e81599e4375b4ae12ff7fe65e0810479ad719b4a Mon Sep 17 00:00:00 2001
From: Christian Weiske <cweiske@cweiske.de>
Date: Tue, 1 Nov 2011 06:41:25 +0100
Subject: [PATCH 8/8] Fix bug #3399815: PHP error in opensearch API in 0.98.3

---
 doc/ChangeLog          | 1 +
 www/api/opensearch.php | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 7e3a064..50015c8 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -9,6 +9,7 @@ ChangeLog for SemantiScuttle
 - Fix bug: Subtitle was not escaped
 - Fix bug #3393951: Logo images missing on bookmark page
 - Fix bug #3388219: Incorrect URL when cancelling tag2tag-actions
+- Fix bug #3399815: PHP error in opensearch API in 0.98.3
 
 
 0.98.3 - 2011-08-09
diff --git a/www/api/opensearch.php b/www/api/opensearch.php
index db95639..3e7dbf7 100644
--- a/www/api/opensearch.php
+++ b/www/api/opensearch.php
@@ -1,8 +1,8 @@
 <?php 
 $httpContentType = 'text/xml';
 require_once '../www-header.php';
+echo '<' . '?xml version="1.0" encoding="utf-8" ?' . ">\n";
 ?>
-<?xml version="1.0" encoding="utf-8" ?>
 <OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
   <ShortName><?php echo $GLOBALS['sitename']?></ShortName>
   <LongName></LongName>