Merge remote-tracking branch 'upstream/master'

1 files changed, 22 insertions, 1 deletions

diff --git a/www/index.php b/www/index.php
index f6704ae..7fbb84c 100644
--- a/www/index.php
+++ b/www/index.php
@@ -42,9 +42,30 @@ if (GET_ACTION == "logout") {
 // Header variables
 $tplVars['loadjs'] = true;
 $tplVars['rsschannels'] = array(
-array(sprintf(T_('%s: Recent bookmarks'), $sitename), createURL('rss').'?sort='.getSortOrder())
+    array(
+        sprintf(T_('%s: Recent bookmarks'), $sitename),
+        createURL('rss') . '?sort=' . getSortOrder()
+    )
 );
 
+if ($userservice->isLoggedOn()) {
+    if ($userservice->isPrivateKeyValid($currentUser->getPrivateKey())) {
+        $currentUsername = $currentUser->getUsername();
+        array_push(
+            $tplVars['rsschannels'],
+            array(
+                sprintf(
+                    T_('%s: Recent bookmarks (+private %s)'),
+                    $sitename, $currentUsername
+                ),
+                createURL('rss')
+                . '?sort=' . getSortOrder()
+                . '&privateKey=' . $currentUser->getPrivateKey()
+            )
+        );
+    }
+}
+
 if ($usecache) {
 	// Generate hash for caching on
 	$hashtext = $_SERVER['REQUEST_URI'];