From ec345f7a1343769abdf3f5920a0732b24726b733 Mon Sep 17 00:00:00 2001
From: Mark Pemberton
Date: Fri, 13 May 2011 14:26:51 -0400
Subject: new privatekey2 branch with privatekey changes

---
 www/rss.php | 43 +++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 41 insertions(+), 2 deletions(-)

(limited to 'www/rss.php')

diff --git a/www/rss.php b/www/rss.php
index 50240e5..8c81e0e 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -64,9 +64,14 @@ if (!isset($rssEntries) || $rssEntries <= 0) {
     $rssEntries = $maxRssEntries;
 }
 
+$privatekey = null;
+if (isset($_GET['privatekey'])) {
+    $privatekey = $_GET['privatekey'];
+}
 
 $watchlist = null;
 $pagetitle = '';
+$isTempLogin = false;
 if ($user && $user != 'all') {
     if ($user == 'watchlist') {
         $user = $cat;
@@ -78,8 +83,24 @@ if ($user && $user != 'all') {
     } else {
         if ($userinfo = $userservice->getUserByUsername($user)) {
             $userid =& $userinfo[$userservice->getFieldName('primary')];
+            /* if user is not logged in and has valid privatekey */
+            if (!$userservice->isLoggedOn()) {
+                if ($privatekey != null) {
+                    if ($userservice->loginPrivateKey($privatekey)) {
+                        $isTempLogin = true;
+                    } else {
+                        $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
+                        header('Content-type: text/html; charset=utf-8');
+                        $templateservice->loadTemplate('error.404.tpl', $tplVars);
+                        //throw a 404 error
+                        exit();
+                    }
+                }
+            }
+
         } else {
             $tplVars['error'] = sprintf(T_('User with username %s was not found'), $user);
+            header('Content-type: text/html; charset=utf-8');
             $templateservice->loadTemplate('error.404.tpl', $tplVars);
             //throw a 404 error
             exit();
@@ -87,7 +108,19 @@ if ($user && $user != 'all') {
     }
     $pagetitle .= ": ". $user;
 } else {
-    $userid = null;
+    if ($privatekey != null) {
+        if ($userservice->loginPrivateKey($privatekey)) {
+            $isTempLogin = true;
+        } else {
+            $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
+            header('Content-type: text/html; charset=utf-8');
+            $templateservice->loadTemplate('error.404.tpl', $tplVars);
+            //throw a 404 error
+            exit();
+        }
+    } else {
+        $userid = null;
+    }
 }
 
 if ($cat) {
@@ -100,7 +133,8 @@ $tplVars['feeddescription'] = sprintf(T_('Recent bookmarks posted to %s'), $GLOB
 
 $bookmarks = $bookmarkservice->getBookmarks(
     0, $rssEntries, $userid, $cat,
-    null, getSortOrder(), $watchlist
+    null, getSortOrder(), $watchlist,
+    null, null, null
 );
 
 $bookmarks_tmp = filter($bookmarks['bookmarks']);
@@ -134,6 +168,11 @@ $tplVars['feedlastupdate'] = date('r', strtotime($latestdate));
 
 $templateservice->loadTemplate('rss.tpl', $tplVars);
 
+/* If temporary login, please log out */
+if ($isTempLogin) {
+    $userservice->logout();
+}
+
 if ($usecache) {
     // Cache output if existing copy has expired
     $cacheservice->End($hash);
-- 
cgit v1.2.3-54-g00ecf


From 84e603aa91a303a1419962ff3ff6086710a7b1a9 Mon Sep 17 00:00:00 2001
From: Mark Pemberton
Date: Sat, 4 Jun 2011 00:29:04 -0400
Subject: Reverted changes of date() to gdate(), added tests to confirm
 existence of private RSS feed, and finalized changes to the user session
 usage with rss.php

---
 src/SemanticScuttle/Service/Bookmark.php     |  2 +-
 src/SemanticScuttle/Service/Bookmark2Tag.php |  2 +-
 src/SemanticScuttle/Service/User.php         |  2 --
 tests/Api/PostsAddTest.php                   |  4 ++--
 tests/TestBaseApi.php                        | 21 ++++++++++++-------
 tests/www/bookmarksTest.php                  | 27 ++++++++++++++++++++++++
 www/ajaxGetNewPrivateKey.php                 | 31 +++++++++++-----------------
 www/index.php                                |  2 +-
 www/jsScuttle.php                            |  8 +++++++
 www/rss.php                                  | 14 ++-----------
 10 files changed, 68 insertions(+), 45 deletions(-)

(limited to 'www/rss.php')

diff --git a/src/SemanticScuttle/Service/Bookmark.php b/src/SemanticScuttle/Service/Bookmark.php
index f69b4d1..17ab7ba 100644
--- a/src/SemanticScuttle/Service/Bookmark.php
+++ b/src/SemanticScuttle/Service/Bookmark.php
@@ -486,7 +486,7 @@ class SemanticScuttle_Service_Bookmark extends SemanticScuttle_DbService
         } else {
             $time = strtotime($date);
         }
-        $datetime = date('Y-m-d H:i:s', $time);
+        $datetime = gmdate('Y-m-d H:i:s', $time);
 
         if ($short === '') {
             $short = null;
diff --git a/src/SemanticScuttle/Service/Bookmark2Tag.php b/src/SemanticScuttle/Service/Bookmark2Tag.php
index fc59a1c..04ee43d 100644
--- a/src/SemanticScuttle/Service/Bookmark2Tag.php
+++ b/src/SemanticScuttle/Service/Bookmark2Tag.php
@@ -584,7 +584,7 @@ class SemanticScuttle_Service_Bookmark2Tag extends SemanticScuttle_DbService
 
         if (is_int($days)) {
             $query .= ' AND B.bDatetime > "'
-                . date('Y-m-d H:i:s', time() - (86400 * $days))
+                . gmdate('Y-m-d H:i:s', time() - (86400 * $days))
                 . '"';
         }
 
diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index 18d5a29..a4870b7 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -571,8 +571,6 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
         $this->db->sql_freeresult($dbresult);
 
         if ($row) {
-            $id = $_SESSION[$this->getSessionKey()]
-                = $row[$this->getFieldName('primary')];
             return true;
         } else {
             return false;
diff --git a/tests/Api/PostsAddTest.php b/tests/Api/PostsAddTest.php
index 2613a87..e6d0531 100644
--- a/tests/Api/PostsAddTest.php
+++ b/tests/Api/PostsAddTest.php
@@ -111,7 +111,7 @@ TXT;
         $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
-            date('Y-m-d H:i:s', strtotime($bmDatetime)),
+            gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),
             $bm['bDatetime']
         );
     }
@@ -173,7 +173,7 @@ TXT;
         $this->assertEquals($bmDescription, stripslashes($bm['bDescription']));
         $this->assertEquals($bmTags, $bm['tags']);
         $this->assertEquals(
-            date('Y-m-d H:i:s', strtotime($bmDatetime)),
+            gmdate('Y-m-d H:i:s', strtotime($bmDatetime)),
             $bm['bDatetime']
         );
     }
diff --git a/tests/TestBaseApi.php b/tests/TestBaseApi.php
index 20574f3..d8917aa 100644
--- a/tests/TestBaseApi.php
+++ b/tests/TestBaseApi.php
@@ -164,15 +164,16 @@ class TestBaseApi extends TestBase
      *
      * Useful for testing HTML pages or ajax URLs.
      *
-     * @param string $urlSuffix Suffix for the URL
-     * @param mixed  $auth      If user authentication is needed (true/false)
-     *                          or array with username and password
+     * @param string  $urlSuffix Suffix for the URL
+     * @param mixed   $auth      If user authentication is needed (true/false)
+     *                           or array with username and password
+     * @param boolean $privateKey True if to add user with private key
      *
      * @return array(HTTP_Request2, integer) HTTP request object and user id
      *
      * @uses getRequest()
      */
-    protected function getLoggedInRequest($urlSuffix = null, $auth = true)
+    protected function getLoggedInRequest($urlSuffix = null, $auth = true, $privateKey = false)
     {
         if (is_array($auth)) {
             list($username, $password) = $auth;
@@ -180,7 +181,13 @@ class TestBaseApi extends TestBase
             $username = 'testuser';
             $password = 'testpassword';
         }
-        $uid = $this->addUser($username, $password);
+        //include privatekey if requested
+        if ($privateKey) {
+            $pKey = $this->us->getNewPrivateKey();
+        } else {
+            $pKey = null;
+        }
+        $uid = $this->addUser($username, $password, $pKey);
 
         $req = new HTTP_Request2(
             $GLOBALS['unittestUrl'] . '/login.php?unittestMode=1',
@@ -234,7 +241,7 @@ class TestBaseApi extends TestBase
      */
     protected function setUnittestConfig($arConfig)
     {
-        $str = '<' . "?php\r\n";
+        $str = '<' . "?php\n";
         foreach ($arConfig as $name => $value) {
             $str .= '$' . $name . ' = '
                 . var_export($value, true) . ";\n";
@@ -253,4 +260,4 @@ class TestBaseApi extends TestBase
         );
     }
 }
-?>
\ No newline at end of file
+?>
diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index df360cc..eaf78bf 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -76,5 +76,32 @@ class www_bookmarksTest extends TestBaseApi
         $this->assertEquals(1, (string)$elements[0]['value']);
     }//end testDefaultPrivacyBookmarksAdd
 
+
+    /**
+     * Test that the private RSS link exists when a user
+     * has a private key and is enabled
+     */
+    public function testVerifyPrivateRSSLinkExists()
+    {
+        list($req, $uId) = $this->getLoggedInRequest('?unittestMode=1', true, true);
+
+        $user = $this->us->getUser($uId);
+        $reqUrl = $GLOBALS['unittestUrl'] . 'bookmarks.php/'
+            . $user['username'];
+        $req->setUrl($reqUrl);
+        $req->setMethod(HTTP_Request2::METHOD_GET);
+        $response = $req->send();
+        $response_body = $response->getBody();
+        $this->assertNotEquals('', $response_body, 'Response is empty');
+
+        $x = simplexml_load_string($response_body);
+        $ns = $x->getDocNamespaces();
+        $x->registerXPathNamespace('ns', reset($ns));
+
+        $elements = $x->xpath('//ns:link');
+        $this->assertEquals(5, count($elements), 'Number of Links in Head not correct');
+        $this->assertContains('privatekey=', (string)$elements[4]['href']);
+    }//end testVerifyPrivateRSSLinkExists
+
 }//end class www_bookmarksTest
 ?>
diff --git a/www/ajaxGetNewPrivateKey.php b/www/ajaxGetNewPrivateKey.php
index 59545a2..eacebd8 100644
--- a/www/ajaxGetNewPrivateKey.php
+++ b/www/ajaxGetNewPrivateKey.php
@@ -1,23 +1,16 @@
 <?php
-/***************************************************************************
- Copyright (C) 2005 - 2006 Scuttle project
- http://sourceforge.net/projects/scuttle/
- http://scuttle.org/
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- ***************************************************************************/
+/**
+ * Ajax script to retrieve new Private Key
+ *
+ * PHP version 5.
+ *
+ * @category Bookmarking
+ * @package  SemanticScuttle
+ * @author   Christian Weiske <cweiske@cweiske.de>
+ * @author   Mark Pemberton <mpemberton5@gmail.com>
+ * @license  AGPL http://www.gnu.org/licenses/agpl.html
+ * @link     http://sourceforge.net/projects/semanticscuttle
+ */
 
 header("Last-Modified: ". gmdate("D, d M Y H:i:s") ." GMT");
 header("Cache-Control: no-cache, must-revalidate");
diff --git a/www/index.php b/www/index.php
index 931d64d..fab235f 100644
--- a/www/index.php
+++ b/www/index.php
@@ -51,7 +51,7 @@ if ($userservice->isLoggedOn()) {
         array_push(
             $tplVars['rsschannels'],
             array(
-                filter($sitename . sprintf(T_(': (private) ')) . $currentUsername),
+                filter($sitename . sprintf(T_(': Recent bookmarks (private)')) . $currentUsername),
                 createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privatekey='.$currentUser->getPrivateKey())
             )
         );
diff --git a/www/jsScuttle.php b/www/jsScuttle.php
index 76b49dc..3ca41ec 100644
--- a/www/jsScuttle.php
+++ b/www/jsScuttle.php
@@ -89,6 +89,14 @@ function useAddress(ele) {
     }
 }
 
+/**
+ * Makes an ajax call to PHP script to generate an new Private Key
+ *
+ * @param input    Calling object
+ * @param response Response object that returned value is placed
+ *
+ * @return boolean Returns false to halt execution after call
+ */
 function getNewPrivateKey(input, response){
     var pk = document.getElementById('pPrivateKey');
     if (response != null) {
diff --git a/www/rss.php b/www/rss.php
index 8c81e0e..2927534 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -71,7 +71,6 @@ if (isset($_GET['privatekey'])) {
 
 $watchlist = null;
 $pagetitle = '';
-$isTempLogin = false;
 if ($user && $user != 'all') {
     if ($user == 'watchlist') {
         $user = $cat;
@@ -86,9 +85,7 @@ if ($user && $user != 'all') {
             /* if user is not logged in and has valid privatekey */
             if (!$userservice->isLoggedOn()) {
                 if ($privatekey != null) {
-                    if ($userservice->loginPrivateKey($privatekey)) {
-                        $isTempLogin = true;
-                    } else {
+                    if (!$userservice->loginPrivateKey($privatekey)) {
                         $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
                         header('Content-type: text/html; charset=utf-8');
                         $templateservice->loadTemplate('error.404.tpl', $tplVars);
@@ -109,9 +106,7 @@ if ($user && $user != 'all') {
     $pagetitle .= ": ". $user;
 } else {
     if ($privatekey != null) {
-        if ($userservice->loginPrivateKey($privatekey)) {
-            $isTempLogin = true;
-        } else {
+        if (!$userservice->loginPrivateKey($privatekey)) {
             $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
             header('Content-type: text/html; charset=utf-8');
             $templateservice->loadTemplate('error.404.tpl', $tplVars);
@@ -168,11 +163,6 @@ $tplVars['feedlastupdate'] = date('r', strtotime($latestdate));
 
 $templateservice->loadTemplate('rss.tpl', $tplVars);
 
-/* If temporary login, please log out */
-if ($isTempLogin) {
-    $userservice->logout();
-}
-
 if ($usecache) {
     // Cache output if existing copy has expired
     $cacheservice->End($hash);
-- 
cgit v1.2.3-54-g00ecf


From dd34ad34075e071795bcb18f09cd9699141bbc25 Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Thu, 9 Jun 2011 09:13:42 +0200
Subject: fix E_NOTICE

---
 www/rss.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'www/rss.php')

diff --git a/www/rss.php b/www/rss.php
index 2927534..b8f6948 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -69,6 +69,7 @@ if (isset($_GET['privatekey'])) {
     $privatekey = $_GET['privatekey'];
 }
 
+$userid    = null;
 $watchlist = null;
 $pagetitle = '';
 if ($user && $user != 'all') {
-- 
cgit v1.2.3-54-g00ecf


From 3d11286cbcc3cb35efe11f6e4a4ef5ac81620bda Mon Sep 17 00:00:00 2001
From: Christian Weiske
Date: Mon, 27 Jun 2011 22:31:24 +0200
Subject: privatekey -> privateKey everywhere

---
 src/SemanticScuttle/Service/User.php | 20 ++++++++++----------
 tests/TestBase.php                   |  2 +-
 tests/UserTest.php                   | 24 ++++++++++++------------
 tests/www/bookmarksTest.php          |  4 ++--
 tests/www/indexTest.php              |  4 ++--
 tests/www/rssTest.php                |  6 +++---
 www/bookmarks.php                    |  2 +-
 www/index.php                        |  2 +-
 www/rss.php                          | 16 ++++++++--------
 www/tags.php                         |  2 +-
 10 files changed, 41 insertions(+), 41 deletions(-)

(limited to 'www/rss.php')

diff --git a/src/SemanticScuttle/Service/User.php b/src/SemanticScuttle/Service/User.php
index b5b053f..7550ed2 100644
--- a/src/SemanticScuttle/Service/User.php
+++ b/src/SemanticScuttle/Service/User.php
@@ -51,7 +51,7 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
         'primary'    => 'uId',
         'username'   => 'username',
         'password'   => 'password',
-        'privatekey' => 'privatekey'
+        'privateKey' => 'privateKey'
     );
 
     protected $profileurl;
@@ -219,13 +219,13 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
     /**
      * Returns user row from database.
      *
-     * @param string $privatekey Private Key
+     * @param string $privateKey Private Key
      *
      * @return array User array from database, false if no user was found
      */
-    public function getUserByPrivateKey($privatekey)
+    public function getUserByPrivateKey($privateKey)
     {
-        return $this->_getuser($this->getFieldName('privatekey'), $privatekey);
+        return $this->_getuser($this->getFieldName('privateKey'), $privateKey);
     }
 
     function getObjectUserByUsername($username) {
@@ -539,24 +539,24 @@ class SemanticScuttle_Service_User extends SemanticScuttle_DbService
     }
 
     /**
-     * Try to authenticate via the privatekey
+     * Try to authenticate via the privateKey
      *
-     * @param string $privatekey Private Key
+     * @param string $privateKey Private Key
      *
      * @return boolean true if the user could be authenticated,
      *                 false if not.
      */
-    public function loginPrivateKey($privatekey)
+    public function loginPrivateKey($privateKey)
     {
         /* Check if private key valid and enabled */
-        if (!$this->isPrivateKeyValid($privatekey)) {
+        if (!$this->isPrivateKeyValid($privateKey)) {
             return false;
         }
 
         $query = 'SELECT '. $this->getFieldName('primary') .' FROM '
             . $this->getTableName() .' WHERE '
-            . $this->getFieldName('privatekey') .' = "'
-            . $this->db->sql_escape($privatekey) .'"';
+            . $this->getFieldName('privateKey') .' = "'
+            . $this->db->sql_escape($privateKey) .'"';
 
         if (!($dbresult = $this->db->sql_query($query))) {
             message_die(
diff --git a/tests/TestBase.php b/tests/TestBase.php
index 2180d2d..2914749 100644
--- a/tests/TestBase.php
+++ b/tests/TestBase.php
@@ -99,7 +99,7 @@ class TestBase extends PHPUnit_Framework_TestCase
      * @param string $password   Password, may be null
      * @param mixed  $privateKey String private key or boolean true to generate one
      *
-     * @return array ID of user, Name of user, password of user, privatekey
+     * @return array ID of user, Name of user, password of user, privateKey
      */
     protected function addUserData(
         $username = null, $password = null, $privateKey = null
diff --git a/tests/UserTest.php b/tests/UserTest.php
index 230167d..6cd6786 100644
--- a/tests/UserTest.php
+++ b/tests/UserTest.php
@@ -40,7 +40,7 @@ class UserTest extends TestBase
     public function testAddUserPrivateKey()
     {
         $name = substr(md5(uniqid()), 0, 6);
-        $pkey = 'my-privatekey';
+        $pkey = 'my-privateKey';
         $id   = $this->us->addUser(
             $name, uniqid(), 'foo@example.org', $pkey
         );
@@ -413,17 +413,17 @@ class UserTest extends TestBase
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $this->assertFalse(
             $this->us->isPrivateKeyValid($randKey2),
-            'disabled privatekey should return false'
+            'disabled privateKey should return false'
         );
     }
 
 
     public function testLoginPrivateKeyInvalid()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -436,10 +436,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyValidEnabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -453,10 +453,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyInvalidEnabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -470,10 +470,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyValidDisabledKey()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
@@ -491,10 +491,10 @@ class UserTest extends TestBase
 
     public function testLoginPrivateKeyInvalidDisabled()
     {
-        /* normal user with enabled privatekey */
+        /* normal user with enabled privateKey */
         $randKey = $this->us->getNewPrivateKey();
         $uid1 = $this->addUser('testusername', 'passw0rd', $randKey);
-        /* user that has disabled privatekey */
+        /* user that has disabled privateKey */
         $randKey2 = '-'.$this->us->getNewPrivateKey();
         $uid2 = $this->addUser('seconduser', 'passw0RD', $randKey2);
 
diff --git a/tests/www/bookmarksTest.php b/tests/www/bookmarksTest.php
index 1e1f4eb..ae82118 100755
--- a/tests/www/bookmarksTest.php
+++ b/tests/www/bookmarksTest.php
@@ -92,7 +92,7 @@ class www_bookmarksTest extends TestBaseApi
         $this->assertEquals(
             2, count($elements), 'Number of Links in Head not correct'
         );
-        $this->assertContains('privatekey=', (string)$elements[1]['href']);
+        $this->assertContains('privateKey=', (string)$elements[1]['href']);
     }//end testVerifyPrivateRSSLinkExists
 
 
@@ -121,7 +121,7 @@ class www_bookmarksTest extends TestBaseApi
         $this->assertEquals(
             1, count($elements), 'Number of Links in Head not correct'
         );
-        $this->assertNotContains('privatekey=', (string)$elements[0]['href']);
+        $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
     }//end testVerifyPrivateRSSLinkDoesNotExist
 
 }//end class www_bookmarksTest
diff --git a/tests/www/indexTest.php b/tests/www/indexTest.php
index 18cb75a..503fd1f 100644
--- a/tests/www/indexTest.php
+++ b/tests/www/indexTest.php
@@ -26,7 +26,7 @@ class www_indexTest extends TestBaseApi
 
         $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
         $this->assertEquals(2, count($elements), 'Number of Links in Head not correct');
-        $this->assertContains('privatekey=', (string)$elements[1]['href']);
+        $this->assertContains('privateKey=', (string)$elements[1]['href']);
     }//end testVerifyPrivateRSSLinkExists
 
 
@@ -50,7 +50,7 @@ class www_indexTest extends TestBaseApi
 
         $elements = $x->xpath('//ns:link[@rel="alternate" and @type="application/rss+xml"]');
         $this->assertEquals(1, count($elements), 'Number of Links in Head not correct');
-        $this->assertNotContains('privatekey=', (string)$elements[0]['href']);
+        $this->assertNotContains('privateKey=', (string)$elements[0]['href']);
     }//end testVerifyPrivateRSSLinkDoesNotExist
 
 
diff --git a/tests/www/rssTest.php b/tests/www/rssTest.php
index 75e4363..71d0198 100644
--- a/tests/www/rssTest.php
+++ b/tests/www/rssTest.php
@@ -78,7 +78,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('?privatekey=' . $privateKey);
+        $req = $this->getRequest('?privateKey=' . $privateKey);
         $response_body = $req->send()->getBody();
 
         $rss = simplexml_load_string($response_body);
@@ -103,7 +103,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('/' . $username . '?privatekey=' . $privateKey);
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
         $response_body = $req->send()->getBody();
 
         $rss = simplexml_load_string($response_body);
@@ -129,7 +129,7 @@ class www_rssTest extends TestBaseApi
             null, 'private bookmark'
         );
 
-        $req = $this->getRequest('/' . $username . '?privatekey=' . $privateKey);
+        $req = $this->getRequest('/' . $username . '?privateKey=' . $privateKey);
         $cookies = $req->setCookieJar()->getCookieJar();
         $response_body = $req->send()->getBody();
 
diff --git a/www/bookmarks.php b/www/bookmarks.php
index 44119db..7056fa6 100644
--- a/www/bookmarks.php
+++ b/www/bookmarks.php
@@ -276,7 +276,7 @@ if ($templatename == 'editbookmark.tpl') {
                 $tplVars['rsschannels'],
                 array(
                     filter($sitename . $rssTitle. sprintf(T_(': (private) ')) . $currentUsername),
-                    createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privatekey='.$currentUser->getPrivateKey())
+                    createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privateKey='.$currentUser->getPrivateKey())
                 )
             );
         }
diff --git a/www/index.php b/www/index.php
index 2fa21f8..f270f73 100644
--- a/www/index.php
+++ b/www/index.php
@@ -52,7 +52,7 @@ if ($userservice->isLoggedOn()) {
             $tplVars['rsschannels'],
             array(
                 filter(sprintf(T_('%s: Recent bookmarks (+private) %s'), $sitename, $currentUsername)),
-                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privatekey='.$currentUser->getPrivateKey())
+                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privateKey='.$currentUser->getPrivateKey())
             )
         );
     }
diff --git a/www/rss.php b/www/rss.php
index b8f6948..d888726 100644
--- a/www/rss.php
+++ b/www/rss.php
@@ -64,9 +64,9 @@ if (!isset($rssEntries) || $rssEntries <= 0) {
     $rssEntries = $maxRssEntries;
 }
 
-$privatekey = null;
-if (isset($_GET['privatekey'])) {
-    $privatekey = $_GET['privatekey'];
+$privateKey = null;
+if (isset($_GET['privateKey'])) {
+    $privateKey = $_GET['privateKey'];
 }
 
 $userid    = null;
@@ -83,10 +83,10 @@ if ($user && $user != 'all') {
     } else {
         if ($userinfo = $userservice->getUserByUsername($user)) {
             $userid =& $userinfo[$userservice->getFieldName('primary')];
-            /* if user is not logged in and has valid privatekey */
+            /* if user is not logged in and has valid privateKey */
             if (!$userservice->isLoggedOn()) {
-                if ($privatekey != null) {
-                    if (!$userservice->loginPrivateKey($privatekey)) {
+                if ($privateKey != null) {
+                    if (!$userservice->loginPrivateKey($privateKey)) {
                         $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
                         header('Content-type: text/html; charset=utf-8');
                         $templateservice->loadTemplate('error.404.tpl', $tplVars);
@@ -106,8 +106,8 @@ if ($user && $user != 'all') {
     }
     $pagetitle .= ": ". $user;
 } else {
-    if ($privatekey != null) {
-        if (!$userservice->loginPrivateKey($privatekey)) {
+    if ($privateKey != null) {
+        if (!$userservice->loginPrivateKey($privateKey)) {
             $tplVars['error'] = sprintf(T_('Failed to Autenticate User with username %s using private key'), $user);
             header('Content-type: text/html; charset=utf-8');
             $templateservice->loadTemplate('error.404.tpl', $tplVars);
diff --git a/www/tags.php b/www/tags.php
index 09725e4..fca8a04 100644
--- a/www/tags.php
+++ b/www/tags.php
@@ -77,7 +77,7 @@ if ($userservice->isLoggedOn()) {
             $tplVars['rsschannels'],
             array(
                 filter($sitename .': Tags: '. $cat . sprintf(T_(': (private) ')) . $currentUsername),
-                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privatekey='.$currentUser->getPrivateKey())
+                createURL('rss', filter($currentUsername, 'url') . '?sort='.getSortOrder().'&amp;privateKey='.$currentUser->getPrivateKey())
             )
         );
     }
-- 
cgit v1.2.3-54-g00ecf