Merge branch 'master' into privatekey2

Conflicts:

	data/templates/default/bookmarks.tpl.php

1 files changed, 40 insertions, 0 deletions

diff --git a/data/templates/default/sidebar.block.related.php b/data/templates/default/sidebar.block.related.php
new file mode 100644
index 0000000..60ee486
--- /dev/null
+++ b/data/templates/default/sidebar.block.related.php
@@ -0,0 +1,40 @@
+<?php
+/* Service creation: only useful services are created */
+$b2tservice =SemanticScuttle_Service_Factory::get('Bookmark2Tag');
+
+
+if(!isset($user)) $user="";
+
+
+$logged_on_userid = $userservice->getCurrentUserId();
+if ($logged_on_userid === false) {
+    $logged_on_userid = NULL;
+}
+
+if(!isset($userid)) {
+	$userid = NULL;
+}
+
+if(isset($user) && strlen($user)==0) {
+    $cat_url = createURL('tags', '%2$s');
+}
+if ($currenttag) {
+    $relatedTags = $b2tservice->getRelatedTags($currenttag, $userid, $logged_on_userid);
+    if (sizeof($relatedTags) > 0) {
+?>
+
+<h2><?php echo T_('Related Tags'); ?></h2>
+<div id="related">
+    <table>
+    <?php foreach($relatedTags as $row): ?>
+    <tr>        
+        <td><a href="<?php echo sprintf($cat_url, filter($user, 'url'), filter($row['tag'], 'url')); ?>" rel="tag"><?php echo filter($row['tag']); ?></a> <a href="<?php echo sprintf($cat_url, filter($user, 'url'), filter($currenttag, 'url') .'+'. filter($row['tag'], 'url')); ?>" title="<?php echo $currenttag . '+' . filter($row['tag']); ?>" class="crossTags">+</a></td>      
+    </tr>
+    <?php endforeach; ?>
+    </table>
+</div>
+
+<?php
+    }
+}
+?>